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

0024255: Regressions in test cases on OCCT vc9 win64 Release

Browse Source 
Updated test-cases from branch CR24255_3

0024255: Regressions in test cases on OCCT vc9 win64 Release

Small refactoring.

Fix for CASE bugs modalg_5 bug25298_09: FAILED (error)

Test-cases correction (bugs modalg_5 bugs25804_1, bug25704_2)
This commit is contained in:
ifv 2015-02-12 14:38:39 +03:00 committed by bugmaster
parent 48e653b689
commit 873c119ff1
102 changed files with 4301 additions and 3440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BOPTools/BOPTools_AlgoTools3D.cxx
View File

@ -742,7 +742,7 @@ Standard_Integer BOPTools_AlgoTools3D::PointInFace
Handle(IntTools_Context)& theContext)
{
Standard_Boolean bIsDone, bHasFirstPoint, bHasSecondPoint;
Standard_Integer iErr, aIx, aNbDomains;
Standard_Integer iErr, aIx = 0, aNbDomains = 0;
Standard_Real aUMin, aUMax, aVMin, aVMax;
Standard_Real aVx = 0., aUx, aV1, aV2;
gp_Dir2d aD2D (0., 1.);
@ -764,25 +764,37 @@ Standard_Integer BOPTools_AlgoTools3D::PointInFace
BRepTools::UVBounds(aFF, aUMin, aUMax, aVMin, aVMax);
//
aUx=IntTools_Tools::IntermediatePoint(aUMin, aUMax);
Standard_Integer i;
for(i = 1; i <= 2; ++i)
{
aP2D.SetCoord(aUx, 0.);
aL2D=new Geom2d_Line (aP2D, aD2D);
Geom2dAdaptor_Curve aHCur(aL2D);
//
aIx=aHatcher.AddHatching(aHCur) ;
//
aHatcher.Trim();
aHatcher.Trim(aIx);
bIsDone=aHatcher.TrimDone(aIx);
if (!bIsDone) {
iErr=1;
return iErr;
}
//
if(aHatcher.NbPoints(aIx) > 1)
{
aHatcher.ComputeDomains(aIx);
bIsDone=aHatcher.IsDone(aIx);
if (!bIsDone) {
iErr=2;
return iErr;
}
break;
}
else
{
aUx = aUMax - (aUx - aUMin);
}
}
//
aNbDomains=aHatcher.NbDomains(aIx);
if (aNbDomains > 0) {

80
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@ -100,7 +100,8 @@
#include <Geom2dLProp_CLProps2d.hxx>
#include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
#include <Standard_ErrorHandler.hxx>
#ifdef OCCT_DEBUG
//#define DRAW
#ifdef DRAW
#include <Draw.hxx>
#include <DrawTrSurf.hxx>
@ -114,6 +115,7 @@ static Standard_Integer NbOFFSET = 0;
static Standard_Integer NbEDGES = 0;
static Standard_Integer NbBISSEC = 0;
#endif
#endif
// Modified by Sergey KHROMOV - Thu Nov 16 17:24:39 2000 Begin
@ -167,7 +169,6 @@ static void EdgeVertices (const TopoDS_Edge& E,
TopExp::Vertices(E,V1,V2);
}
}
static Standard_Boolean VertexFromNode
(const Handle(MAT_Node)& aNode,
const Standard_Real Offset,
@ -354,6 +355,7 @@ void BRepFill_OffsetWire::Init(const TopoDS_Face& Spine,
// mySpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
myJoinType = Join;
myIsOpenResult = IsOpenResult;
myMap.Clear();
myMapSpine.Clear();
//------------------------------------------------------------------
@ -805,11 +807,13 @@ void BRepFill_OffsetWire::PerformWithBiLo
}
#ifdef OCCT_DEBUG
#ifdef DRAW
if (AffichEdge) {
cout << " End Construction of geometric primitives "<<endl;
}
#endif
#endif
//---------------------------------------------------
@ -830,13 +834,15 @@ void BRepFill_OffsetWire::PerformWithBiLo
CurrentArc = Locus.Graph()->Arc(i);
Bisector_Bisec Bisec = Locus.GeomBis(CurrentArc,Reverse);
#ifdef OCCT_DEBUG
#ifdef DRAW
if ( AffichGeom) {
char name[256];
sprintf(name,"BISSEC_%d",NbBISSEC++);
DrawTrSurf::Set(name,Bisec.Value());
}
#endif
#endif
//-------------------------------------------------------------------
@ -985,10 +991,12 @@ void BRepFill_OffsetWire::PerformWithBiLo
}
}
#ifdef OCCT_DEBUG
#ifdef DRAW
if (AffichEdge) {
cout << " End Construction of vertices on offsets"<<endl;
}
#endif
#endif
//----------------------------------
@ -1106,6 +1114,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
dist2 = l3d.Distance( TV2->Pnt() );
if (! MapVertex.Contains( V1 ))
{
TV1->Pnt( f3d );
MapVertex.Add( V1 );
}
@ -1214,15 +1223,21 @@ void BRepFill_OffsetWire::PrepareSpine()
TopExp::Vertices(NW, aV1, aV2);
NW.Closed(aV1.IsSame(aV2));
// Modified by Sergey KHROMOV - Thu Mar 7 09:17:43 2002 End
B.Add(myWorkSpine, NW);
}
#ifdef OCCT_DEBUG
#ifdef DRAW
if ( AffichEdge) {
DBRep::Set("WS",myWorkSpine);
DBRep::Set("MS",mySpine);
BRepTools::Write(myWorkSpine, "WS");
BRepTools::Write(mySpine, "MS");
}
#endif
#endif
}
@ -1266,7 +1281,7 @@ void BRepFill_OffsetWire::UpdateDetromp (BRepFill_DataMapOfOrientedShapeListOfSh
gp_Pnt2d P = Bis->Value((U2 + U1)*0.5);
Standard_Boolean IsP_inside = Standard_True;
if (myJoinType == GeomAbs_Arc)
if ((myJoinType != GeomAbs_Intersection) || EOnE)
IsP_inside = Trim.IsInside(P);
if (!IsP_inside) {
if (!V1.IsNull()) {
@ -1303,6 +1318,13 @@ void BRepFill_OffsetWire::UpdateDetromp (BRepFill_DataMapOfOrientedShapeListOfSh
}
}
}
//else if(myJoinType != GeomAbs_Arc)
//{
// if (!V1.IsNull()) {
// Detromp(Shape1).Append(V1);
// Detromp(Shape2).Append(V1);
// }
//}
}
//=======================================================================
@ -1348,6 +1370,7 @@ void BRepFill_OffsetWire::MakeWires()
//--------------------------------------
BRep_Builder B;
// Standard_Integer NbEdges;
// Standard_Boolean NewWire = Standard_True;
// Standard_Boolean AddEdge = Standard_False;
@ -1375,6 +1398,7 @@ void BRepFill_OffsetWire::MakeWires()
// Modified by Sergey KHROMOV - Thu Mar 14 11:29:59 2002 Begin
Standard_Boolean isClosed = Standard_False;
// Modified by Sergey KHROMOV - Thu Mar 14 11:30:00 2002 End
while(!End) {
@ -1514,7 +1538,12 @@ void BRepFill_OffsetWire::FixHoles()
TopoDS_Vertex Vf, Vl;
TopExp::Vertices( Base, Vf, Vl );
if(Vf.IsNull() || Vl.IsNull())
{
Standard_Failure::Raise("BRepFill_OffsetWire::FixHoles(): Wrong wire.");
#ifdef OCCT_DEBUG
BRepTools::Write(Base, "Base");
#endif
}
gp_Pnt Pf, Pl;
Pf = BRep_Tool::Pnt(Vf);
Pl = BRep_Tool::Pnt(Vl);
@ -1528,7 +1557,15 @@ void BRepFill_OffsetWire::FixHoles()
TopExp::Vertices( aWire, V1, V2 );
if(V1.IsNull() || V2.IsNull())
{
Standard_Failure::Raise("BRepFill_OffsetWire::FixHoles(): Wrong wire.");
#ifdef OCCT_DEBUG
BRepTools::Write(Base, "Base");
char name[128];
sprintf(name,"Wire_%d",i);
BRepTools::Write(aWire, name);
#endif
}
gp_Pnt P1, P2;
P1 = BRep_Tool::Pnt(V1);
@ -1789,6 +1826,7 @@ Standard_Integer CutEdge (const TopoDS_Edge& E,
CutCurve (CT2d, 2, theCurves);
} else {
for (Standard_Integer k = 1; k <= Cuter.NbCurves(); k++)
theCurves.Append(Cuter.Value(k));
}
} else if (ForceCut == 2) {
@ -1796,6 +1834,7 @@ Standard_Integer CutEdge (const TopoDS_Edge& E,
CutCurve (CT2d, 3, theCurves);
} else {
if (Cuter.NbCurves() == 2) {
Handle(Geom2d_TrimmedCurve)CC = Cuter.Value(1);
if (CC->LastParameter() > (l+f)/2.) {
@ -1811,6 +1850,7 @@ Standard_Integer CutEdge (const TopoDS_Edge& E,
}
}
}
// Modified by Sergey KHROMOV - Thu Nov 16 17:28:37 2000 End
//--------------------------------------
@ -1929,6 +1969,7 @@ void MakeCircle (const TopoDS_Edge& E,
LL.Append(OE);
Map.Add(V,LL);
#ifdef OCCT_DEBUG
#ifdef DRAW
if ( AffichGeom && !OE.IsNull()) {
char name[256];
@ -1936,6 +1977,7 @@ void MakeCircle (const TopoDS_Edge& E,
DBRep::Set(name,OE);
}
#endif
#endif
}
//=======================================================================
@ -2059,13 +2101,15 @@ void MakeOffset (const TopoDS_Edge& E,
LL.Append(OE);
Map.Add(E,LL);
#ifdef OCCT_DEBUG
#ifdef DRAW
if (AffichGeom && !OE.IsNull()) {
char name[256];
sprintf(name,"OFFSET_%d",++NbOFFSET);
DBRep::Set(name,OE);
Standard_Real ii = 0;
//Standard_Real ii = 0;
}
#endif
#endif
}
@ -2188,6 +2232,7 @@ void TrimEdge (const TopoDS_Edge& E,
if (!BRep_Tool::Degenerated(E)) {
for (Standard_Integer k = 1; k < TheVer.Length(); k ++) {
if (TheVer.Value(k).IsSame(TheVer.Value(k+1)) ||
Abs(ThePar.Value(k)-ThePar.Value(k+1)) <= Precision::PConfusion()) {
if(k+1 == TheVer.Length()) {
@ -2312,6 +2357,7 @@ void TrimEdge (const TopoDS_Edge& E,
TheBuilder.Range(NewEdge,ThePar.Value(k),ThePar.Value(k+1));
#ifdef OCCT_DEBUG
#ifdef DRAW
if ( AffichEdge) {
char name[256];
@ -2333,7 +2379,7 @@ void TrimEdge (const TopoDS_Edge& E,
Draw::Set(name,dr);
}
#endif
#endif
S.Append(NewEdge);
}
}
@ -2438,30 +2484,40 @@ static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
const TopoDS_Shape& SE = Link.GeneratingShape(Locus.BasicElt(ic,ie));
if (SE.ShapeType() == TopAbs_EDGE) {
if (aMap.Contains(SE)) {
//cout << "Edge is treated second time" << endl;
continue;
}
TopoDS_Edge E = TopoDS::Edge(SE);
Standard_Real f,l;
Handle(Geom2d_Curve) G2d = BRep_Tool::CurveOnSurface(E,F,f,l);
Geom2dAdaptor_Curve AC(G2d,f,l);
GeomAbs_CurveType aCType = AC.GetType();
if(aCType != GeomAbs_Line && aCType != GeomAbs_Circle) {
Standard_Boolean reverse = Standard_False;
if (E.Orientation() == TopAbs_FORWARD) reverse = Standard_True;
gp_Pnt2d P, Pc;
gp_Dir2d N;
Geom2dLProp_CLProps2d aCLProps(G2d, 2, eps);
aCLProps.SetParameter(f);
if(!aCLProps.IsTangentDefined()) {
BadEdges.Append(SE);
@ -2469,9 +2525,11 @@ static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
continue;
}
P = aCLProps.Value();
Standard_Real Crv = aCLProps.Curvature();
if(Crv >= eps) {
aCLProps.Tangent(N);
Standard_Real x = N.Y(), y = -N.X();
@ -2488,6 +2546,7 @@ static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
}
}
aCLProps.SetParameter(l);
if(!aCLProps.IsTangentDefined()) {
BadEdges.Append(SE);
@ -2495,9 +2554,11 @@ static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
continue;
}
P = aCLProps.Value();
Crv = aCLProps.Curvature();
if(Crv >= eps) {
aCLProps.Tangent(N);
Standard_Real x = N.Y(), y = -N.X();
@ -2526,6 +2587,7 @@ static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
//=======================================================================
static Standard_Boolean PerformCurve (TColStd_SequenceOfReal& Parameters,
TColgp_SequenceOfPnt& Points,
const Adaptor3d_Curve& C,
const Standard_Real Deflection,
@ -2551,6 +2613,7 @@ static Standard_Boolean PerformCurve (TColStd_SequenceOfReal& Parameters,
if((aDelta/aDist) > 5.0e-14)
{
QuasiFleche(C,Deflection*Deflection,
UU1,Pdeb,
Ddeb,
UU2,Pfin,
@ -2568,6 +2631,7 @@ static Standard_Boolean PerformCurve (TColStd_SequenceOfReal& Parameters,
//=======================================================================
static void QuasiFleche(const Adaptor3d_Curve& C,
const Standard_Real Deflection2,
const Standard_Real Udeb,
const gp_Pnt& Pdeb,
@ -2603,8 +2667,10 @@ static void QuasiFleche(const Adaptor3d_Curve& C,
Standard_Real N2 = Vdelta.SquareMagnitude();
if (N1 > Eps && N2 > Eps) {
Standard_Real Normediff =
(Vdeb.Normalized().XYZ()-Vdelta.Normalized().XYZ()).SquareModulus();
if (Normediff > Eps) {
theFleche = Normediff*Norme/64.;
flecheok = Standard_True;
}
@ -2622,6 +2688,7 @@ static void QuasiFleche(const Adaptor3d_Curve& C,
}
else {
QuasiFleche(C,Deflection2,Udeb,Pdeb,
Vdeb,
Udeb+Udelta,Pdelta,
Vdelta,
@ -2633,6 +2700,7 @@ static void QuasiFleche(const Adaptor3d_Curve& C,
if (Nbmin > 2) {
QuasiFleche(C,Deflection2,Udeb+Udelta,Pdelta,
Vdelta,
Ufin,Pfin,
Vfin,

111
src/BRepFill/BRepFill_TrimEdgeTool.cxx
View File

@ -31,13 +31,17 @@
#include <Precision.hxx>
#include <IntRes2d_IntersectionPoint.hxx>
#include <IntRes2d_IntersectionSegment.hxx>
#include <ElCLib.hxx>
#include <StdFail_NotDone.hxx>
#ifdef OCCT_DEBUG
//#define DRAW
#ifdef DRAW
#include <DrawTrSurf.hxx>
#include <DBRep.hxx>
static Standard_Boolean Affich = Standard_False;
static Standard_Boolean AffichInt = Standard_False;
static Standard_Integer intind = 0;
#endif
#endif
@ -318,23 +322,24 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
Geom2dAdaptor_Curve AC2(C2,f,l);
#ifdef DRAW
if ( Affich) {
if ( AffichInt) {
f = AC1.FirstParameter();
l = AC1.LastParameter();
char* CURVE1name = "CURVE1";
DrawTrSurf::Set(CURVE1name, new Geom2d_TrimmedCurve(C1,f,l));
char name[32];
sprintf(name,"C1_%d", ++intind);
DrawTrSurf::Set(name, new Geom2d_TrimmedCurve(C1,f,l));
f = AC2.FirstParameter();
l = AC2.LastParameter();
char* CURVE2name = "CURVE2";
DrawTrSurf::Set(CURVE2name, new Geom2d_TrimmedCurve(C2,f,l));
sprintf(name,"C2_%d", intind);
DrawTrSurf::Set(name, new Geom2d_TrimmedCurve(C2,f,l));
f = myBis.FirstParameter();
l = myBis.LastParameter();
char* bisname = "BIS";
DrawTrSurf::Set(bisname, new Geom2d_TrimmedCurve(myBis.Curve(),f,l));
char* Edge1name = "E1";
DBRep::Set(Edge1name, Edge1);
char* Edge2name = "E2";
DBRep::Set(Edge2name, Edge2);
sprintf(name,"BIS%d", intind);
DrawTrSurf::Set(name, new Geom2d_TrimmedCurve(myBis.Curve(),f,l));
sprintf(name,"E1_%d", intind);
DBRep::Set(name, Edge1);
sprintf(name,"E2_%d", intind);
DBRep::Set(name, Edge2);
}
#endif
@ -347,6 +352,7 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
EvalParameters (myBis,AC2,Points2);
Standard_Integer SeanceDeRattrapage=0;
Standard_Real TolInit= 1.e-9;
Standard_Integer nn = 7;
@ -358,6 +364,63 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
nn = 6;
}
if(Params.IsEmpty() && Points2.IsEmpty())
{
//Check, may be there are no intersections at all
// for case myBis == Line
if(myBis.GetType() == GeomAbs_Line)
{
Standard_Real dmax = TolInit;
Standard_Integer n = 0;
while(n < nn)
{
dmax *= 10.0;
++n;
}
dmax *= dmax;
//
gp_Lin2d anL = myBis.Line();
Standard_Boolean isFar1 = Standard_True;
Standard_Boolean isFar2 = Standard_True;
gp_Pnt2d aP;
//
Standard_Real d = RealLast();
AC1.D0(AC1.FirstParameter(), aP);
Standard_Real par = ElCLib::Parameter(anL, aP);
if(par >= myBis.FirstParameter() && par <= myBis.LastParameter())
{
d = anL.SquareDistance(aP);
}
AC1.D0(AC1.LastParameter(), aP);
par = ElCLib::Parameter(anL, aP);
if(par >= myBis.FirstParameter() && par <= myBis.LastParameter())
{
d = Min(anL.SquareDistance(aP), d);
}
isFar1 = d > dmax;
//
d = RealLast();
AC2.D0(AC2.FirstParameter(), aP);
par = ElCLib::Parameter(anL, aP);
if(par >= myBis.FirstParameter() && par <= myBis.LastParameter())
{
d = anL.SquareDistance(aP);
}
AC2.D0(AC2.LastParameter(), aP);
par = ElCLib::Parameter(anL, aP);
if(par >= myBis.FirstParameter() && par <= myBis.LastParameter())
{
d = Min(anL.SquareDistance(aP), d);
}
isFar2 = d > dmax;
//
if(isFar1 && isFar2)
{
return;
}
}
}
while ( SeanceDeRattrapage < nn // TolInit <= 0.01
&& ( Points2.Length() != Params.Length() ||
(Points2.Length() == 0 && Params.Length() == 0) ) ) {
@ -387,7 +450,7 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
if(Params.Length() == 0 && Points2.Length() == 1) {
//cout << "Params.Length() == 0 && Points2.Length() == 1" << endl;
Standard_Real dmin;
Standard_Real dmin, dmax = 0.25*myOffset*myOffset;
Standard_Real tBis = Points2(1).X();
gp_Pnt2d PBis = myBis.Value(tBis);
@ -395,19 +458,26 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
gp_Pnt2d PC = AC1.Value(t);
dmin = PC.SquareDistance(PBis);
gp_Pnt P(tBis, t, 0.);
if(dmin < dmax)
{
Params.Append(P);
}
t = AC1.LastParameter();
PC = AC1.Value(t);
if(dmin > PC.SquareDistance(PBis)) {
Standard_Real dmin1 = PC.SquareDistance(PBis);
if(dmin > dmin1 && dmin1 < dmax ) {
P.SetY(t);
if(Params.IsEmpty())
Params.Append(P);
else
Params.SetValue(1,P);
}
}
else if(Params.Length() == 1 && Points2.Length() == 0) {
//cout << "Params.Length() == 1 && Points2.Length() == 0" << endl;
Standard_Real dmin;
Standard_Real dmin, dmax = 0.25*myOffset*myOffset;
Standard_Real tBis = Params(1).X();
gp_Pnt2d PBis = myBis.Value(tBis);
@ -415,12 +485,19 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
gp_Pnt2d PC = AC2.Value(t);
dmin = PC.SquareDistance(PBis);
gp_Pnt P(tBis, t, 0.);
if(dmin < dmax)
{
Points2.Append(P);
}
t = AC2.LastParameter();
PC = AC2.Value(t);
if(dmin > PC.SquareDistance(PBis)) {
Standard_Real dmin1 = PC.SquareDistance(PBis);
if(dmin > dmin1 && dmin1 < dmax ) {
P.SetY(t);
if(Points2.IsEmpty())
Points2.Append(P);
else
Points2.SetValue(1,P);
}
}

6
src/BRepLib/BRepLib.cxx
View File

@ -780,7 +780,13 @@ static void SetEdgeTol(const TopoDS_Edge& E,
gp_Pnt Pc3d = HC->Value(u);
gp_Pnt2d p2d = pc->Value(u);
gp_Pnt Pcons = ElSLib::Value(p2d.X(),p2d.Y(),pln);
Standard_Real eps = Max(Pc3d.XYZ().SquareModulus(), Pcons.XYZ().SquareModulus());
eps = Epsilon(eps);
Standard_Real temp = Pc3d.SquareDistance(Pcons);
if(temp <= eps)
{
temp = 0.;
}
if(temp > d2) d2 = temp;
}
d2 = 1.5*sqrt(d2);

144
src/BRepLib/BRepLib_FindSurface.cxx
View File

@ -19,7 +19,7 @@
#include <Precision.hxx>
#include <math_Matrix.hxx>
#include <math_Vector.hxx>
#include <math_Gauss.hxx>
#include <math_Jacobi.hxx>
#include <gp_Lin.hxx>
#include <gp_Circ.hxx>
@ -45,6 +45,8 @@
#include <TopoDS_Vertex.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS.hxx>
#include <BRep_Builder.hxx>
#include <BRepTopAdaptor_FClass2d.hxx>
#include <GeomLib.hxx>
#include <Geom2d_Curve.hxx>
@ -331,27 +333,15 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
continue;
else
{
const Standard_Integer aNbPolMax = 200;
Standard_Integer incr = 1;
if(iNbPol > aNbPolMax)
{
Standard_Integer nb = iNbPol;
while(nb > aNbPolMax)
{
incr++;
nb = (iNbPol-1) / incr;
}
}
Handle(TColgp_HArray1OfPnt) aPoles = new (TColgp_HArray1OfPnt) (1, iNbPol);
GC->Poles(aPoles->ChangeArray1());
gp_Pnt aPolePrev = aPoles->Value(1), aPoleNext;
Standard_Real dfDistPrev = 0., dfDistNext;
Standard_Integer iPol;
for (iPol = 1; iPol <= iNbPol; iPol += incr)
for (Standard_Integer iPol=1; iPol<=iNbPol; iPol++)
{
if (iPol <= iNbPol - incr)
if (iPol<iNbPol)
{
aPoleNext = aPoles->Value(iPol+incr);
aPoleNext = aPoles->Value(iPol+1);
dfDistNext = aPolePrev.Distance(aPoleNext);
}
else
@ -436,50 +426,115 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
aMat(1,1)+=w*p.X()*p.X();
aMat(1,2)+=w*p.X()*p.Y();
aMat(1,3)+=w*p.X()*p.Z();
aMat(2,1)+=w*p.Y()*p.X();
//
aMat(2,2)+=w*p.Y()*p.Y();
aMat(2,3)+=w*p.Y()*p.Z();
aMat(3,1)+=w*p.Z()*p.X();
aMat(3,2)+=w*p.Z()*p.Y();
//
aMat(3,3)+=w*p.Z()*p.Z();
aVec(1) -= w*p.X();
aVec(2) -= w*p.Y();
aVec(3) -= w*p.Z();
}
aMat(2,1) = aMat(1,2);
aMat(3,1) = aMat(1,3);
aMat(3,2) = aMat(2,3);
//
math_Jacobi anEignval(aMat);
math_Vector anEVals(1,3);
Standard_Boolean isSolved = anEignval.IsDone();
Standard_Integer isol = 0;
if(isSolved)
{
anEVals = anEignval.Values();
//We need vector with eigenvalue ~ 0.
Standard_Real anEMin = RealLast();
Standard_Real anEMax = -anEMin;
for(i = 1; i <= 3; ++i)
{
Standard_Real anE = Abs(anEVals(i));
if(anEMin > anE)
{
anEMin = anE;
isol = i;
}
if(anEMax < anE)
{
anEMax = anE;
}
}
if(isol == 0)
{
isSolved = Standard_False;
}
else
{
Standard_Real eps = Epsilon(anEMax);
if(anEMin <= eps)
{
anEignval.Vector(isol, aVec);
}
else
{
//try using vector product of other axes
Standard_Integer ind[2] = {0,0};
for(i = 1; i <= 3; ++i)
{
if(i == isol)
{
continue;
}
if(ind[0] == 0)
{
ind[0] = i;
continue;
}
if(ind[1] == 0)
{
ind[1] = i;
continue;
}
}
math_Vector aVec1(1, 3, 0.), aVec2(1, 3, 0.);
anEignval.Vector(ind[0], aVec1);
anEignval.Vector(ind[1], aVec2);
gp_Vec aV1(aVec1(1), aVec1(2), aVec1(3));
gp_Vec aV2(aVec2(1), aVec2(2), aVec2(3));
gp_Vec aN = aV1^ aV2;
aVec(1) = aN.X();
aVec(2) = aN.Y();
aVec(3) = aN.Z();
}
if (aVec.Norm2() < gp::Resolution()) {
isSolved = Standard_False;
}
}
}
// Solve the system of equations to get plane coefficients
math_Gauss aSolver(aMat);
Standard_Boolean isSolved = aSolver.IsDone();
//
// let us be more tolerant (occ415)
Standard_Real dfDist = RealLast();
Handle(Geom_Plane) aPlane;
//
if (isSolved) {
aSolver.Solve(aVec);
if (aVec.Norm2()<gp::Resolution()) {
isSolved = Standard_False;
}
}
//
if (isSolved) {
aPlane = new Geom_Plane(aBaryCenter,gp_Dir(aVec(1),aVec(2),aVec(3)));
//Plane normal can have two directions, direction is chosen
//according to direction of eigenvector
gp_Vec anN(aVec(1), aVec(2), aVec(3));
aPlane = new Geom_Plane(aBaryCenter,anN);
dfDist = Controle (aPoints, aPlane);
}
//
if (!isSolved || myTolerance < dfDist) {
gp_Pnt aFirstPnt=aPoints(1);
for (iPoint=2; iPoint<=aPoints.Length(); iPoint++) {
const gp_Pnt& aNextPnt = aPoints(iPoint);
gp_Vec aDir(aFirstPnt, aNextPnt);
gp_Vec aDir(aFirstPnt,aPoints(iPoint));
Standard_Real dfSide=aDir.Magnitude();
if (dfSide<myTolerance) {
continue; // degeneration
}
for (Standard_Integer iP1=iPoint+1; iP1<=aPoints.Length(); iP1++) {
gp_Vec aCross = gp_Vec(aFirstPnt,aPoints(iP1)) ^ aDir ;
if (aCross.Magnitude() > dfSide*myTolerance) {
Handle(Geom_Plane) aPlane2 = new Geom_Plane(aFirstPnt, aCross);
Handle(Geom_Plane) aPlane2 = new Geom_Plane(aBaryCenter, aCross);
Standard_Real dfDist2 = Controle (aPoints, aPlane2);
if (dfDist2 < myTolerance) {
myTolReached = dfDist2;
@ -504,6 +559,23 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
//myTolReached = dfDist;
//XXt
mySurface = aPlane;
//If S is wire, try to orient surface according to orientation of wire.
if(S.ShapeType() == TopAbs_WIRE && S.Closed())
{
//
TopoDS_Wire aW = TopoDS::Wire(S);
TopoDS_Face aTmpFace = BRepLib_MakeFace(mySurface, Precision::Confusion());
BRep_Builder BB;
BB.Add(aTmpFace, aW);
BRepTopAdaptor_FClass2d FClass(aTmpFace, 0.);
if ( FClass.PerformInfinitePoint() == TopAbs_IN )
{
gp_Dir aN = aPlane->Position().Direction();
aN.Reverse();
mySurface = new Geom_Plane(aPlane->Position().Location(), aN);
}
}
}
//XXf
myTolReached = dfDist;

190
src/BRepMAT2d/BRepMAT2d_Explorer.cxx
View File

@ -39,14 +39,27 @@
#include <BRep_Builder.hxx>
#include <BRepLib.hxx>
#include <TopTools_IndexedDataMapOfShapeShape.hxx>
#include <GeomAbs_CurveType.hxx>
#include <Geom2d_Circle.hxx>
#include <Geom2d_Line.hxx>
#include <Geom2d_Ellipse.hxx>
#include <Geom2d_Parabola.hxx>
#include <Geom2d_Hyperbola.hxx>
#include <Geom2d_BezierCurve.hxx>
#include <GCE2d_MakeArcOfCircle.hxx>
#include <GCE2d_MakeSegment.hxx>
//
// Modified by Sergey KHROMOV - Thu Dec 5 10:38:14 2002 Begin
static TopoDS_Edge MakeEdge(const Handle(Geom2d_Curve) &theCurve,
const TopoDS_Face &theFace,
const TopoDS_Vertex &theVFirst,
const TopoDS_Vertex &theVLast);
// Modified by Sergey KHROMOV - Thu Dec 5 10:38:16 2002 End
//
static GeomAbs_CurveType GetCurveType(const Handle(Geom2d_Curve)& theC2d);
static void AdjustCurveEnd(Handle(Geom2d_BoundedCurve)& theC2d, const gp_Pnt2d theP,
const Standard_Boolean isFirst);
//
//=======================================================================
//function : BRepMAT2d_Explorer
//purpose :
@ -122,8 +135,8 @@ void BRepMAT2d_Explorer::Add(const TopoDS_Wire& Spine,
return;
TopoDS_Edge aFirstEdge = anExp.Current();
TopoDS_Edge aPrevEdge = aFirstEdge;
Standard_Real UFirst,ULast, aD;
Handle(Geom2d_BSplineCurve) BCurve;
Handle(Geom2d_Curve) C2d;
Handle(Geom2d_TrimmedCurve) CT2d;
Handle(Geom2d_TrimmedCurve) aFirstCurve;
@ -175,15 +188,16 @@ void BRepMAT2d_Explorer::Add(const TopoDS_Wire& Spine,
// code should be rewritten.
isModif = Standard_True;
//
//modified by NIZNHY-PKV Tue Aug 7 09:14:03 2007f
//BCurve = Geom2dConvert::CurveToBSplineCurve(CT2d);
BCurve=Geom2dConvert::CurveToBSplineCurve(CT2d, Convert_QuasiAngular);
//modified by NIZNHY-PKV Tue Aug 7 09:14:07 2007t
BCurve->SetPole(1, aPLast);
CT2d = new Geom2d_TrimmedCurve(BCurve, BCurve->FirstParameter(),
BCurve->LastParameter());
Standard_Integer aNbC = theCurves.Value(currentContour).Length();
Handle(Geom2d_BoundedCurve) CPrev =
Handle(Geom2d_BoundedCurve)::DownCast(theCurves.ChangeValue(currentContour).ChangeValue(aNbC));
//
GeomAbs_CurveType TCPrev = GetCurveType(CPrev);
GeomAbs_CurveType TCCurr = GetCurveType(CT2d);
//
if(TCCurr <= TCPrev)
{
AdjustCurveEnd(CT2d, aPLast, Standard_True);
// Creation of new edge.
TopoDS_Edge aNewEdge;
TopoDS_Vertex aVf = TopExp::FirstVertex(anEdge);
@ -198,9 +212,32 @@ void BRepMAT2d_Explorer::Add(const TopoDS_Wire& Spine,
anOldNewE.ChangeFromKey(anEdge) = aNewEdge;
}
else
{
gp_Pnt2d aP = CT2d->Value(CT2d->FirstParameter());
AdjustCurveEnd(CPrev, aP, Standard_False);
theCurves.ChangeValue(currentContour).ChangeValue(aNbC) = CPrev;
//Change previous edge
TopoDS_Edge aNewEdge;
TopoDS_Vertex aVf = TopExp::FirstVertex(aPrevEdge);
TopoDS_Vertex aVl = TopExp::LastVertex(aPrevEdge);
if (aPrevEdge.Orientation() == TopAbs_FORWARD)
aNewEdge = MakeEdge(CPrev, aNewFace, aVf, aVl);
else
aNewEdge = MakeEdge(CPrev->Reversed(), aNewFace, aVf, aVl);
aNewEdge.Orientation(aPrevEdge.Orientation());
anOldNewE.ChangeFromKey(aPrevEdge) = aNewEdge;
}
}
aPLast = CT2d->Value(CT2d->LastParameter());
Add(CT2d);
aPrevEdge = anEdge;
}
// Check of the distance between the first and the last point of wire
@ -208,19 +245,19 @@ void BRepMAT2d_Explorer::Add(const TopoDS_Wire& Spine,
if (myIsClosed(currentContour) && aPLast.Distance(aPFirst) > aTolConf) {
isModif = Standard_True;
//modified by NIZNHY-PKV Tue Aug 7 09:20:08 2007f
//Handle(Geom2d_BSplineCurve)
//BCurve = Geom2dConvert::CurveToBSplineCurve(aFirstCurve);
BCurve = Geom2dConvert::CurveToBSplineCurve(aFirstCurve, Convert_QuasiAngular);
//modified by NIZNHY-PKV Tue Aug 7 09:20:11 2007t
BCurve->SetPole(1, aPLast);
aFirstCurve = new Geom2d_TrimmedCurve(BCurve, BCurve->FirstParameter(),
BCurve->LastParameter());
//
Standard_Integer aNbC = theCurves.Value(currentContour).Length();
Handle(Geom2d_BoundedCurve) CPrev =
Handle(Geom2d_BoundedCurve)::DownCast(theCurves.ChangeValue(currentContour).ChangeValue(aNbC));
//
GeomAbs_CurveType TCPrev = GetCurveType(CPrev);
GeomAbs_CurveType TCCurr = GetCurveType(aFirstCurve);
//
if(TCCurr <= TCPrev)
{
AdjustCurveEnd(aFirstCurve, aPLast, Standard_True);
theCurves.ChangeValue(currentContour).ChangeValue(1) = aFirstCurve;
// Creation of new first edge.
// Creation of new edge.
TopoDS_Edge aNewEdge;
TopoDS_Vertex aVf = TopExp::FirstVertex(aFirstEdge);
TopoDS_Vertex aVl = TopExp::LastVertex(aFirstEdge);
@ -231,8 +268,31 @@ void BRepMAT2d_Explorer::Add(const TopoDS_Wire& Spine,
aNewEdge = MakeEdge(aFirstCurve->Reversed(), aNewFace, aVf, aVl);
aNewEdge.Orientation(aFirstEdge.Orientation());
anOldNewE.ChangeFromKey(aFirstEdge) = aNewEdge;
}
else
{
gp_Pnt2d aP = aFirstCurve->Value(aFirstCurve->FirstParameter());
AdjustCurveEnd(CPrev, aP, Standard_False);
theCurves.ChangeValue(currentContour).ChangeValue(aNbC) = CPrev;
//Change previous edge
TopoDS_Edge aNewEdge;
TopoDS_Vertex aVf = TopExp::FirstVertex(aPrevEdge);
TopoDS_Vertex aVl = TopExp::LastVertex(aPrevEdge);
if (aPrevEdge.Orientation() == TopAbs_FORWARD)
aNewEdge = MakeEdge(CPrev, aNewFace, aVf, aVl);
else
aNewEdge = MakeEdge(CPrev->Reversed(), aNewFace, aVf, aVl);
aNewEdge.Orientation(aPrevEdge.Orientation());
anOldNewE.ChangeFromKey(aPrevEdge) = aNewEdge;
}
}
TopoDS_Wire aNewWire;
BRep_Builder aBuilder;
@ -498,3 +558,85 @@ TopoDS_Edge MakeEdge(const Handle(Geom2d_Curve) &theCurve,
return aNewEdge;
}
// Modified by Sergey KHROMOV - Wed Mar 6 17:40:14 2002 End
//
//=======================================================================
//function : GetCurveType
//purpose : Get curve type.
//=======================================================================
GeomAbs_CurveType GetCurveType(const Handle(Geom2d_Curve)& theC2d)
{
GeomAbs_CurveType aTypeCurve = GeomAbs_OtherCurve;
Handle(Standard_Type) TheType = theC2d->DynamicType();
if ( TheType == STANDARD_TYPE(Geom2d_TrimmedCurve)) {
TheType = (*((Handle(Geom2d_TrimmedCurve)*)&theC2d))->BasisCurve()->DynamicType();
}
if ( TheType == STANDARD_TYPE(Geom2d_Circle)) {
aTypeCurve = GeomAbs_Circle;
}
else if ( TheType ==STANDARD_TYPE(Geom2d_Line)) {
aTypeCurve = GeomAbs_Line;
}
else if ( TheType == STANDARD_TYPE(Geom2d_Ellipse)) {
aTypeCurve = GeomAbs_Ellipse;
}
else if ( TheType == STANDARD_TYPE(Geom2d_Parabola)) {
aTypeCurve = GeomAbs_Parabola;
}
else if ( TheType == STANDARD_TYPE(Geom2d_Hyperbola)) {
aTypeCurve = GeomAbs_Hyperbola;
}
else if ( TheType == STANDARD_TYPE(Geom2d_BezierCurve)) {
aTypeCurve = GeomAbs_BezierCurve;
}
else if ( TheType == STANDARD_TYPE(Geom2d_BSplineCurve)) {
aTypeCurve = GeomAbs_BSplineCurve;
}
else {
aTypeCurve = GeomAbs_OtherCurve;
}
return aTypeCurve;
}
//=======================================================================
//function : AdjustCurveEnd
//purpose :
//=======================================================================
void AdjustCurveEnd(Handle(Geom2d_BoundedCurve)& theC2d, const gp_Pnt2d theP,
const Standard_Boolean isFirst)
{
GeomAbs_CurveType aType = GetCurveType(theC2d);
if(aType == GeomAbs_Line)
{
//create new line
if(isFirst)
{
gp_Pnt2d aP = theC2d->Value(theC2d->LastParameter());
theC2d = GCE2d_MakeSegment(theP, aP);
}
else
{
gp_Pnt2d aP = theC2d->Value(theC2d->FirstParameter());
theC2d = GCE2d_MakeSegment(aP, theP);
}
}
else
{
//Convert to BSpline and adjust first pole
Handle(Geom2d_BSplineCurve) BCurve =
Geom2dConvert::CurveToBSplineCurve(theC2d, Convert_QuasiAngular);
if(isFirst)
{
BCurve->SetPole(1, theP);
theC2d = new Geom2d_TrimmedCurve(BCurve, BCurve->FirstParameter(),
BCurve->LastParameter());
}
else
{
BCurve->SetPole(BCurve->NbPoles(), theP);
theC2d = new Geom2d_TrimmedCurve(BCurve, BCurve->FirstParameter(),
BCurve->LastParameter());
}
}
}

16
src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx
View File

@ -36,6 +36,10 @@
#include <TopoDS_Wire.hxx>
#include <StdFail_NotDone.hxx>
#ifdef OCCT_DEBUG
#include <BRepTools.hxx>
static Standard_Boolean AffichSpine = Standard_False;
#endif
//=======================================================================
//function : BRepOffsetAPI_MakeOffset
@ -183,8 +187,20 @@ static void BuildDomains(TopoDS_Face& myFace,
StdFail_NotDone::Raise ("BRepOffsetAPI_MakeOffset : Build Domains");
}
TopTools_ListOfShape Faces;
#ifdef OCCT_DEBUG
Standard_Integer ns = 0;
#endif
for (; FR.More(); FR.Next()) {
Faces.Append(FR.Current());
#ifdef OCCT_DEBUG
if(AffichSpine)
{
char name[32];
ns++;
sprintf(name, "FR%d",ns);
BRepTools::Write(FR.Current(), name);
}
#endif
}
//===========================================

137
src/Bisector/Bisector_Bisec.cxx
View File

@ -21,6 +21,7 @@
#include <Geom2d_Point.hxx>
#include <Geom2d_CartesianPoint.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2d_BSplineCurve.hxx>
#include <gp.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_Vec2d.hxx>
@ -31,13 +32,19 @@
#include <Bisector_BisecAna.hxx>
#include <Bisector_BisecPC.hxx>
#include <Bisector_BisecCC.hxx>
#include <GCE2d_MakeSegment.hxx>
/*
#ifdef OCCT_DEBUG
//#define DRAW
#ifdef DRAW
#include <DrawTrSurf.hxx>
static char tname[100];
static Standard_CString name = tname ;
#pragma comment(lib, "TKDraw.lib")
static char name[100];
static Standard_Integer nbb = 0;
*/
static Standard_Boolean Affich = Standard_False;
#endif
#endif
static Standard_Boolean IsMaxRC (const Handle(Geom2d_Curve)& C,
Standard_Real U,
@ -88,14 +95,63 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
->BasisCurve()->DynamicType();
}
Handle(Geom2d_Curve) afirstcurve1 = afirstcurve;
Handle(Geom2d_Curve) asecondcurve1 = asecondcurve;
if(Type1 == STANDARD_TYPE(Geom2d_BSplineCurve))
{
Handle(Geom2d_BSplineCurve) aBS;
if(afirstcurve->DynamicType() == STANDARD_TYPE(Geom2d_TrimmedCurve))
{
aBS = Handle(Geom2d_BSplineCurve)::DownCast(Handle(Geom2d_TrimmedCurve)::DownCast(afirstcurve)
->BasisCurve());
}
else
{
aBS = Handle(Geom2d_BSplineCurve)::DownCast(afirstcurve);
}
if(aBS->Degree() == 1 && aBS->NbPoles() == 2)
{
if(aBS->Pole(1).Distance(aBS->Pole(2)) < 1.e-4)
{
afirstcurve1 = GCE2d_MakeSegment(aBS->Pole(1), aBS->Pole(2));
Type1 = STANDARD_TYPE(Geom2d_Line);
}
}
}
if(Type2 == STANDARD_TYPE(Geom2d_BSplineCurve))
{
Handle(Geom2d_BSplineCurve) aBS;
if(asecondcurve->DynamicType() == STANDARD_TYPE(Geom2d_TrimmedCurve))
{
aBS = Handle(Geom2d_BSplineCurve)::DownCast(Handle(Geom2d_TrimmedCurve)::DownCast(asecondcurve)
->BasisCurve());
}
else
{
aBS = Handle(Geom2d_BSplineCurve)::DownCast(asecondcurve);
}
if(aBS->Degree() == 1 && aBS->NbPoles() == 2)
{
if(aBS->Pole(1).Distance(aBS->Pole(2)) < 1.e-4)
{
asecondcurve1 = GCE2d_MakeSegment(aBS->Pole(1), aBS->Pole(2));
Type2 = STANDARD_TYPE(Geom2d_Line);
}
}
}
if ( (Type1 == STANDARD_TYPE(Geom2d_Circle) || Type1 == STANDARD_TYPE(Geom2d_Line)) &&
(Type2 == STANDARD_TYPE(Geom2d_Circle) || Type2 == STANDARD_TYPE(Geom2d_Line)) ) {
(Type2 == STANDARD_TYPE(Geom2d_Circle) || Type2 == STANDARD_TYPE(Geom2d_Line)) )
{
//------------------------------------------------------------------
// Analytic Bissectrice.
//------------------------------------------------------------------
Handle(Bisector_BisecAna) BisAna = new Bisector_BisecAna();
BisAna->Perform(afirstcurve ,
asecondcurve ,
BisAna->Perform(afirstcurve1 ,
asecondcurve1 ,
apoint ,
afirstvector ,
asecondvector ,
@ -137,8 +193,8 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
// Bissectrice algo
//-------------------------------------------------------------------
Handle(Bisector_BisecCC) BisCC = new Bisector_BisecCC();
BisCC -> Perform(asecondcurve,
afirstcurve ,
BisCC -> Perform(asecondcurve1,
afirstcurve1 ,
adirection ,
adirection ,
apoint);
@ -147,15 +203,30 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
// bissectrice is empty. a point is projected at the end of the guide curve.
// Construction of a false bissectrice.
// modified by NIZHNY-EAP Mon Feb 21 12:00:13 2000 ___BEGIN___
gp_Pnt2d aP1 = afirstcurve1->Value(afirstcurve1->LastParameter());
gp_Pnt2d aP2 = asecondcurve1->Value(asecondcurve1->FirstParameter());
gp_Pnt2d aPm(.5*(aP1.XY()+aP2.XY()));
Standard_Real Nx, Ny;
if(aPm.Distance(apoint) > 10.*Precision::Confusion())
{
Nx = apoint.X() - aPm.X();
Ny = apoint.Y() - aPm.Y();
if(adirection < 0)
{
Nx = -Nx;
Ny = -Ny;
}
}
else
{
gp_Dir2d dir1(afirstvector), dir2(asecondvector);
Standard_Real
Nx = - dir1.X() - dir2.X(),
Ny = - dir1.Y() - dir2.Y();
if (Abs(Nx) <= gp::Resolution() && Abs(Ny) <= gp::Resolution()) {
Nx = -afirstvector.Y();
Ny = afirstvector.X();
}
//gp_Dir2d N ( - adirection*afirstvector.Y(), adirection*afirstvector.X());
}
gp_Dir2d N ( adirection*Nx, adirection*Ny);
// modified by NIZHNY-EAP Mon Feb 21 12:00:19 2000 ___END___
@ -177,9 +248,12 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
}
}
}
UFirst = Max(UFirst, Bis->FirstParameter());
ULast = Min(ULast, Bis->LastParameter());
thebisector = new Geom2d_TrimmedCurve(Bis,UFirst,ULast);
/*
#ifdef DRAW
if(Affich)
{
sprintf( name, "c1_%d", ++nbb );
DrawTrSurf::Set( name, afirstcurve );
sprintf( name, "c2_%d", nbb );
@ -188,7 +262,9 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
DrawTrSurf::Set( name, apoint );
sprintf( name, "b%d", nbb );
DrawTrSurf::Set( name, thebisector );
*/
}
#endif
}
//===========================================================================
@ -317,18 +393,25 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
}
}
}
if(UFirst < Bis->FirstParameter())
UFirst = Bis->FirstParameter();
if(ULast > Bis->LastParameter())
ULast = Bis->LastParameter();
thebisector = new Geom2d_TrimmedCurve(Bis,UFirst,ULast);
/*
#ifdef DRAW
if(Affich)
{
sprintf( name, "c1_%d", ++nbb );
DrawTrSurf::Set( name, afirstcurve );
sprintf( name, "c2_%d", nbb );
DrawTrSurf::Set( name, SecondPnt );
DrawTrSurf::Set( name, asecondpoint->Pnt2d() );
sprintf( name, "p%d", nbb );
DrawTrSurf::Set( name, apoint );
sprintf( name, "b%d", nbb );
DrawTrSurf::Set( name, thebisector );
*/
}
#endif
}
//===========================================================================
@ -455,18 +538,25 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Point)& afirstpoint ,
}
}
}
UFirst = Max(UFirst, Bis->FirstParameter());
ULast = Min(ULast, Bis->LastParameter());
thebisector = new Geom2d_TrimmedCurve(Bis,UFirst,ULast);
/*
#ifdef DRAW
if(Affich)
{
sprintf( name, "c1_%d", ++nbb );
DrawTrSurf::Set( name, FirstPnt );
DrawTrSurf::Set( name, afirstpoint->Pnt2d() );
sprintf( name, "c2_%d", nbb );
DrawTrSurf::Set( name, asecondcurve );
sprintf( name, "p%d", nbb );
DrawTrSurf::Set( name, apoint );
sprintf( name, "b%d", nbb );
DrawTrSurf::Set( name, thebisector );
*/
}
#endif
}
//===========================================================================
@ -503,7 +593,9 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Point)& afirstpoint ,
Bis->ParameterOfStartPoint(),
Bis->ParameterOfEndPoint());
/*
#ifdef DRAW
if(Affich)
{
sprintf( name, "c1_%d", ++nbb );
DrawTrSurf::Set( name, afirstpoint->Pnt2d() );
sprintf( name, "c2_%d", nbb );
@ -512,7 +604,8 @@ void Bisector_Bisec::Perform(const Handle(Geom2d_Point)& afirstpoint ,
DrawTrSurf::Set( name, apoint );
sprintf( name, "b%d", nbb );
DrawTrSurf::Set( name, thebisector );
*/
}
#endif
}
//=============================================================================

30
src/Bisector/Bisector_BisecCC.cxx
View File

@ -122,7 +122,6 @@ void Bisector_BisecCC::Perform(const Handle(Geom2d_Curve)& Cu1,
// Calculate first point of the polygon.
//---------------------------------------------
Standard_Boolean isProjDone = ProjOnCurve (Origin,curve1, U);
P = ValueByInt (U,UC1,UC2,Dist);
if(!isProjDone)
{
@ -130,6 +129,20 @@ void Bisector_BisecCC::Perform(const Handle(Geom2d_Curve)& Cu1,
return;
}
P = ValueByInt (U,UC1,UC2,Dist);
if(Dist < Precision::Confusion())
{
gp_Pnt2d aP1 = curve1->Value(UC1);
gp_Pnt2d aP2 = curve2->Value(UC2);
Standard_Real dp = (aP1.Distance(P)+aP2.Distance(P));
Standard_Real dorig = (aP1.Distance(Origin)+aP2.Distance(Origin));
if(dp < dorig)
{
isEmpty = Standard_True;
return;
}
}
if (Dist < Precision::Infinite()) {
//----------------------------------------------------
// the parameter of the origin point gives a point
@ -619,8 +632,8 @@ gp_Pnt2d Bisector_BisecCC::ValueAndDist (const Standard_Real U,
//---------------------------------------------------------------
gp_Pnt2d P1;
gp_Vec2d T1;
Standard_Real EpsH = 1.E-8;
Standard_Real EpsH100 = 1.E-6;
Standard_Real EpsH = 1.E-9;
Standard_Real EpsH100 = 1.E-7;
curve1->D1 (U1,P1,T1);
gp_Vec2d N1(T1.Y(), - T1.X());
@ -1294,6 +1307,17 @@ static Standard_Boolean PointByInt(const Handle(Geom2d_Curve)& CA,
// Point found => Test distance curvature + Angular test
//---------------------------------------------------------------
P2 = CB->Value(UOnB);
if(P1.SquareDistance(PSol) < 1.e-32)
{
YaSol = Standard_False;
return YaSol;
}
if(P2.SquareDistance(PSol) < 1.e-32)
{
YaSol = Standard_False;
return YaSol;
}
gp_Dir2d PP1Unit(P1.X() - PSol.X(),P1.Y() - PSol.Y());
gp_Dir2d PP2Unit(P2.X() - PSol.X(),P2.Y() - PSol.Y());

26
src/Bisector/Bisector_Inter.cxx
View File

@ -33,12 +33,14 @@
#include <Precision.hxx>
#include <math_BissecNewton.hxx>
#include <ElCLib.hxx>
#ifdef OCCT_DEBUG
//#define DRAW
#ifdef DRAW
#include <Draw_Appli.hxx>
#include <DrawTrSurf_Curve2d.hxx>
#include <Draw_Marker2D.hxx>
#include <DrawTrSurf.hxx>
static char name[100];
static Standard_Boolean Affich = Standard_False;
static Standard_Integer nbint = 0;
#endif
#endif
//===================================================================================
@ -285,21 +287,17 @@ void Bisector_Inter::SinglePerform(const Handle(Geom2d_Curve)& CBis1,
#ifdef DRAW
if (Affich) {
Handle(DrawTrSurf_Curve2d) dr;
Draw_Color Couleur = Draw_bleu;
dr = new DrawTrSurf_Curve2d(Bis1,Couleur,100);
dout << dr;
dr = new DrawTrSurf_Curve2d(Bis2,Couleur,100);
dout << dr;
sprintf( name, "i1_%d", ++nbint);
DrawTrSurf::Set(name, Bis1);
sprintf( name, "i2_%d", nbint);
DrawTrSurf::Set(name, Bis2);
if (IsDone() && !IsEmpty()) {
for (Standard_Integer k = 1; k <= NbPoints(); k++) {
gp_Pnt2d P = Point(k).Value();
Handle(Draw_Marker2D) drp = new Draw_Marker2D(P,Draw_Plus,Draw_vert);
dout << drp;
sprintf( name, "ip_%d_%d", nbint, k);
DrawTrSurf::Set(name, P);
}
}
dout.Flush();
}
#endif
}

4
src/ChFi3d/ChFi3d_Builder_0.cxx
View File

@ -3370,7 +3370,7 @@ Standard_Boolean ChFi3d_ComputeCurves(Handle(Adaptor3d_HSurface)& S1,
Standard_Integer indd = 0, indf = 0;
for(i = 1; i <= nbp; i++) {
dd = L2S->Value(i).Value().Distance(pntd);
if(dd < ddeb) { ddeb = dd; indd = i;}
if(dd <= ddeb) { ddeb = dd; indd = i;}
dd = L2S->Value(i).Value().Distance(pntf);
if(dd < dfin) { dfin = dd; indf = i;}
}
@ -3475,6 +3475,8 @@ Standard_Boolean ChFi3d_ComputeCurves(Handle(Adaptor3d_HSurface)& S1,
Pc1 = new Geom2d_BSplineCurve(pol2d1,knots,mults,deg);
Pc2 = new Geom2d_BSplineCurve(pol2d2,knots,mults,deg);
tolreached = ChFi3d_EvalTolReached(S1,Pc1,S2,Pc2,C3d);
tolreached = Max(tolreached,ddeb);
tolreached = Max(tolreached,dfin);
return Standard_True;
}
}

3
src/IntCurve/IntCurve_ExactIntersectionPoint.gxx
View File

@ -203,13 +203,14 @@ void IntCurve_ExactIntersectionPoint::MathPerform(void)
,ToleranceVector
,BInfVector
,BSupVector
,50);
,60);
if(Fct.IsDone()) {
Fct.Root(Root); nbroots = 1;
math_Vector XY(1,2);
FctDist.Value(Root,XY);
Standard_Real dist2 = ((XY(1)*XY(1)+XY(2)*XY(2)));
if(dist2 > myTol)
{
nbroots = 0;

156
src/IntCurve/IntCurve_IntPolyPolyGen.gxx
View File

@ -45,6 +45,8 @@
#include <math_FunctionSetRoot.hxx>
#include <math_NewtonFunctionSetRoot.hxx>
#include <NCollection_Handle.hxx>
#include <Bnd_Box2d.hxx>
#include <Precision.hxx>
//======================================================================
@ -58,7 +60,12 @@
//----------------------------------------------------------------------
void GetIntersection(const TheCurve& theC1, const Standard_Real theT1f, const Standard_Real theT1l,
const TheCurve& theC2, const Standard_Real theT2f, const Standard_Real theT2l,
const Standard_Real theTolConf,
const Standard_Integer theMaxCount,
IntRes2d_IntersectionPoint& thePInt, Standard_Real& theDist,
Standard_Integer& theCount);
Standard_Boolean HeadOrEndPoint( const IntRes2d_Domain& D1
@ -787,10 +794,30 @@ Standard_Boolean IntCurve_IntPolyPolyGen::findIntersect(
//--------------------------------------------------------------------
//-- On verifie que le point trouve est bien une racine
//--------------------------------------------------------------------
EIP.Roots(U,V);
TheCurveTool::D1(C1,U,P1,Tan1);
TheCurveTool::D1(C2,V,P2,Tan2);
Standard_Real Dist = P1.Distance(P2);
if(EIP.NbRoots() == 0 && Dist > TolConf)
{
IntRes2d_Transition aTrans;
IntRes2d_IntersectionPoint aPInt(P1, U, V, aTrans, aTrans, Standard_False);
Standard_Real aT1f, aT1l, aT2f, aT2l;
aT1f= thePoly1.ApproxParamOnCurve(SegIndex1, 0.0);
aT1l= thePoly1.ApproxParamOnCurve(SegIndex1, 1.0);
aT2f= thePoly2.ApproxParamOnCurve(SegIndex2, 0.0);
aT2l= thePoly2.ApproxParamOnCurve(SegIndex2, 1.0);
//
Standard_Integer aMaxCount = 16, aCount = 0;
GetIntersection(C1, aT1f, aT1l, C2, aT2f, aT2l, TolConf, aMaxCount,
aPInt, Dist, aCount);
U = aPInt.ParamOnFirst();
V = aPInt.ParamOnSecond();
TheCurveTool::D1(C1,U,P1,Tan1);
TheCurveTool::D1(C2,V,P2,Tan2);
Dist = P1.Distance(P2);
}
//-----------------------------------------------------------------
//-- On verifie que le point (u,v) n existe pas deja
//--
@ -1031,3 +1058,130 @@ Standard_Boolean IntCurve_IntPolyPolyGen::findIntersect(
return Standard_True;
}
//======================================================================
// GetIntersection
//======================================================================
void GetIntersection(const TheCurve& theC1, const Standard_Real theT1f, const Standard_Real theT1l,
const TheCurve& theC2, const Standard_Real theT2f, const Standard_Real theT2l,
const Standard_Real theTolConf,
const Standard_Integer theMaxCount,
IntRes2d_IntersectionPoint& thePInt, Standard_Real& theDist,
Standard_Integer& theCount)
{
theCount++;
//
Standard_Real aTol2 = theTolConf*theTolConf;
Standard_Real aPTol1 = Max(100.*Epsilon(Max(Abs(theT1f), Abs(theT1l))), Precision::PConfusion());
Standard_Real aPTol2 = Max(100.*Epsilon(Max(Abs(theT2f), Abs(theT2l))), Precision::PConfusion());
gp_Pnt2d aP1f, aP1l, aP2f, aP2l;
Bnd_Box2d aB1, aB2;
//
TheCurveTool::D0(theC1, theT1f, aP1f);
TheCurveTool::D0(theC1, theT1l, aP1l);
aB1.Add(aP1f);
aB1.Add(aP1l);
aB1.Enlarge(theTolConf);
//
TheCurveTool::D0(theC2, theT2f, aP2f);
TheCurveTool::D0(theC2, theT2l, aP2l);
aB2.Add(aP2f);
aB2.Add(aP2l);
aB2.Enlarge(theTolConf);
//
if(aB1.IsOut(aB2))
{
theCount--;
return;
}
//
Standard_Boolean isSmall1 = (theT1l - theT1f) <= aPTol1 || aP1f.SquareDistance(aP1l) / 4. <= aTol2;
Standard_Boolean isSmall2 = (theT2l - theT2f) <= aPTol2 || aP2f.SquareDistance(aP2l) / 4. <= aTol2;
if((isSmall1 && isSmall2) || (theCount > theMaxCount))
{
//Seems to be intersection
//Simple treatment of segment intersection
gp_XY aPnts1[3] = {aP1f.XY(), (aP1f.XY() + aP1l.XY()) / 2., aP1l.XY()};
gp_XY aPnts2[3] = {aP2f.XY(), (aP2f.XY() + aP2l.XY()) / 2., aP2l.XY()};
Standard_Integer i, j, imin = -1, jmin = -1;
Standard_Real dmin = RealLast(), d;
for(i = 0; i < 3; i++)
{
for(j = 0; j < 3; j++)
{
d = (aPnts1[i] - aPnts2[j]).SquareModulus();
if(d < dmin)
{
dmin=d;
imin = i;
jmin = j;
}
}
}
//
dmin = Sqrt(dmin);
if(theDist > dmin)
{
theDist = dmin;
//
Standard_Real t1;
if(imin == 0)
{
t1 = theT1f;
}
else if(imin == 1)
{
t1 = (theT1f + theT1l) / 2.;
}
else
{
t1 = theT1l;
}
//
Standard_Real t2;
if(jmin == 0)
{
t2 = theT2f;
}
else if(jmin == 1)
{
t2 = (theT2f + theT2l) / 2.;
}
else
{
t2 = theT2l;
}
//
gp_Pnt2d aPint((aPnts1[imin] + aPnts2[jmin])/2.);
//
IntRes2d_Transition aTrans1, aTrans2;
thePInt.SetValues(aPint, t1, t2, aTrans1, aTrans2, Standard_False);
}
theCount--;
return;
}
if(isSmall1)
{
Standard_Real aT2m = (theT2l + theT2f) / 2.;
GetIntersection(theC1, theT1f, theT1l, theC2, theT2f, aT2m, theTolConf, theMaxCount, thePInt, theDist, theCount);
GetIntersection(theC1, theT1f, theT1l, theC2, aT2m, theT2l, theTolConf, theMaxCount, thePInt, theDist, theCount);
}
else if(isSmall2)
{
Standard_Real aT1m = (theT1l + theT1f) / 2.;
GetIntersection(theC1, theT1f, aT1m, theC2, theT2f, theT2l, theTolConf, theMaxCount, thePInt, theDist, theCount);
GetIntersection(theC1, aT1m, theT1l, theC2, theT2f, theT2l, theTolConf, theMaxCount, thePInt, theDist, theCount);
}
else
{
Standard_Real aT1m = (theT1l + theT1f) / 2.;
Standard_Real aT2m = (theT2l + theT2f) / 2.;
GetIntersection(theC1, theT1f, aT1m, theC2, theT2f, aT2m, theTolConf, theMaxCount, thePInt, theDist, theCount);
GetIntersection(theC1, theT1f, aT1m, theC2, aT2m, theT2l, theTolConf, theMaxCount, thePInt, theDist, theCount);
GetIntersection(theC1, aT1m, theT1l, theC2, theT2f, aT2m, theTolConf, theMaxCount, thePInt, theDist, theCount);
GetIntersection(theC1, aT1m, theT1l, theC2, aT2m, theT2l, theTolConf, theMaxCount, thePInt, theDist, theCount);
}
}

53
src/MAT2d/MAT2d_Mat2d.cxx
View File

@ -830,6 +830,10 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
Standard_Integer parama[2];
Standard_Integer paramb[2];
//
Standard_Integer aNbOfNarea1 = 0, aPrefNarea = 0, aNbMaxNarea1 = 10;
Standard_Integer aNbElts[2] = {0, 0}, aCountElts[2] = {0, 0};
Standard_Boolean isBreak = Standard_False;
// -----------------------------------------
// Initialisation et remise a zero des maps.
@ -903,7 +907,7 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
// ------------------------------------------------------------------
// Creation des geometries des bissectrices via le tool. (etape 2.1)
// -------------------------------------------------------------------
Standard_Integer aNbBis = noofbisectors - beginbisector;
for(i=beginbisector; i<noofbisectors; i++) {
atool.CreateBisector(bisectormap(i));
@ -917,6 +921,46 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
#endif
}
//Patch to prevent infinit loop because of
//bad geometry
if(aNbBis == 1)
{
if(aPrefNarea == 1)
{
aNbOfNarea1++;
Standard_Integer edge1number = bisectormap(beginbisector)->FirstEdge()->EdgeNumber();
Standard_Integer edge2number = bisectormap(beginbisector)->SecondEdge()->EdgeNumber();
if(aNbElts[0] == edge1number)
{
aCountElts[0]++;
}
else
{
aCountElts[0] = 0;
aNbElts[0] = edge1number;
}
if(aNbElts[1] == edge2number)
{
aCountElts[1]++;
}
else
{
aCountElts[1] = 0;
aNbElts[1] = edge2number;
}
if(aNbOfNarea1 >= aNbMaxNarea1 && (aCountElts[0] >= aNbMaxNarea1 || aCountElts[1] >= aNbMaxNarea1))
{
isBreak = Standard_True;
}
}
else
{
aNbOfNarea1 = 0;
aCountElts[0] = 0;
aCountElts[1] = 0;
}
}
aPrefNarea = aNbBis;
// ---------------------------------------------
// Condition de sortie de la boucle principale.
// ---------------------------------------------
@ -1230,6 +1274,13 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
// Sortie de la boucle principale si il n y a pas d edge a eliminer.
// (etape 2.6)
//------------------------------------------------------------------
//
//Patch to break infinite loop.
if(narea == 1 && isBreak)
{
narea = 0;
}
//
if(narea == 0) {
interrupt = Standard_True;
break;

161
src/MAT2d/MAT2d_Tool2d.cxx
View File

@ -15,7 +15,8 @@
// commercial license or contractual agreement.
#define Debug(expr) cout<<" MAT2d_Tool2d.cxx : expr :"<<expr<<endl;
//#define OCCT_DEBUG
//#define DRAW
#ifdef DRAW
#include <DBRep.hxx>
#include <DrawTrSurf.hxx>
@ -69,11 +70,13 @@
#ifdef DRAW
static Handle(DrawTrSurf_Curve2d) draw;
static Standard_Integer AffichBis = Standard_False;
#endif
#ifdef OCCT_DEBUG
static void MAT2d_DrawCurve(const Handle(Geom2d_Curve)& aCurve,
const Standard_Integer Indice);
static Standard_Boolean Store = Standard_False;
static Standard_Boolean AffichDist = Standard_False;
#endif
//=====================================================================
@ -90,6 +93,10 @@ static Standard_Boolean AreNeighbours(const Standard_Integer IEdge1,
const Standard_Integer NbEdge);
static void SetTrim(Bisector_Bisec& Bis , Handle(Geom2d_Curve)& Line1);
static Standard_Boolean CheckEnds (const Handle(Geom2d_Geometry)& Elt ,
const gp_Pnt2d& PCom ,
const Standard_Real Distance,
const Standard_Real Tol);
static Standard_Real MAT2d_TOLCONF = 1.e-7;
@ -589,9 +596,9 @@ Standard_Boolean MAT2d_Tool2d::Projection (const Standard_Integer IEdge ,
GeomAbs_CurveType TypeC1 = C1.GetType();
if (TypeC1 == GeomAbs_Circle) {
Standard_Real R = C1.Circle().Radius();
Standard_Real EpsCirc = Eps;
Standard_Real EpsCirc = 100.*Eps;
if ( R < 1.) EpsCirc = Eps/R;
if (!((ParamMax - ParamMin + 2*EpsCirc) < 2*M_PI)) {
if (((ParamMax - ParamMin + 2*EpsCirc) < 2*M_PI)) {
ParamMax = ParamMax + EpsCirc; ParamMin = ParamMin - EpsCirc;
}
}
@ -603,12 +610,17 @@ Standard_Boolean MAT2d_Tool2d::Projection (const Standard_Integer IEdge ,
//-----------------------------------------------------
Extrema_ExtPC2d Extremas(PCom,C1,ParamMin,ParamMax);
if (Extremas.IsDone()){
if (Extremas.NbExt() == 0 ) return Standard_False; // Pas de solution!
Distance = Precision::Infinite();
if(Extremas.NbExt() < 1)
{
return Standard_False;
}
for (Standard_Integer i = 1; i <= Extremas.NbExt(); i++) {
if (Extremas.SquareDistance(i) < Distance * Distance) {
Distance = sqrt (Extremas.SquareDistance(i));
if (Extremas.SquareDistance(i) < Distance) {
Distance = Extremas.SquareDistance(i);
}
}
Distance = Sqrt(Distance);
}
else {
if (TypeC1 == GeomAbs_Circle) {
@ -630,6 +642,7 @@ Standard_Boolean MAT2d_Tool2d::IsSameDistance (
Standard_Real& Distance) const
{
TColStd_Array1OfReal Dist(1,4);
const Standard_Real eps = 1.e-7;
Standard_Integer IEdge1,IEdge2,IEdge3,IEdge4;
IEdge1 = BisectorOne->FirstEdge() ->EdgeNumber();
@ -637,26 +650,76 @@ Standard_Boolean MAT2d_Tool2d::IsSameDistance (
IEdge3 = BisectorTwo->FirstEdge() ->EdgeNumber();
IEdge4 = BisectorTwo->SecondEdge()->EdgeNumber();
Projection(IEdge1,PCom,Dist(1));
Projection(IEdge2,PCom,Dist(2));
Standard_Boolean isDone1 = Projection(IEdge1,PCom,Dist(1));
Standard_Boolean isDone2 = Projection(IEdge2,PCom,Dist(2));
if(isDone1)
{
if(!isDone2)
{
Handle(Geom2d_Geometry) Elt = theCircuit->Value(IEdge2);
Standard_Real Tol = Max(Precision::Confusion(), eps*Dist(1));
if(CheckEnds (Elt, PCom, Dist(1), Tol))
{
Dist(2) = Dist(1);
}
}
}
else
{
if(isDone2)
{
Handle(Geom2d_Geometry) Elt = theCircuit->Value(IEdge1);
Standard_Real Tol = Max(Precision::Confusion(), eps*Dist(2));
if(CheckEnds (Elt, PCom, Dist(2), Tol))
{
Dist(1) = Dist(2);
}
}
}
Standard_Boolean isDone3 = Standard_True, isDone4 = Standard_True;
if (IEdge3 == IEdge1) Dist(3) = Dist(1);
else if (IEdge3 == IEdge2) Dist(3) = Dist(2);
else Projection(IEdge3,PCom,Dist(3));
else isDone3 = Projection(IEdge3,PCom,Dist(3));
if (IEdge4 == IEdge1) Dist(4) = Dist(1);
else if (IEdge4 == IEdge2) Dist(4) = Dist(2);
else Projection(IEdge4,PCom,Dist(4));
else isDone4 = Projection(IEdge4,PCom,Dist(4));
//
if(isDone3)
{
if(!isDone4)
{
Handle(Geom2d_Geometry) Elt = theCircuit->Value(IEdge4);
Standard_Real Tol = Max(Precision::Confusion(), eps*Dist(3));
if(CheckEnds (Elt, PCom, Dist(3), Tol))
{
Dist(4) = Dist(3);
}
}
}
else
{
if(isDone4)
{
Handle(Geom2d_Geometry) Elt = theCircuit->Value(IEdge3);
Standard_Real Tol = Max(Precision::Confusion(), eps*Dist(4));
if(CheckEnds (Elt, PCom, Dist(4), Tol))
{
Dist(3) = Dist(4);
}
}
}
#ifdef OCCT_DEBUG
Standard_Boolean Affich = Standard_False;
if (Affich)
if (AffichDist)
for (Standard_Integer j = 1; j <= 4;j++){
cout <<"Distance number : "<<j<<" is :"<< Dist(j)<<endl;
}
#endif
Standard_Real EpsDist = MAT2d_TOLCONF*100. ;
Standard_Real EpsDist = MAT2d_TOLCONF*300. ;
Distance = Dist(1);
for (Standard_Integer i = 1; i <= 4; i++){
if (theJoinType == GeomAbs_Intersection &&
@ -912,11 +975,40 @@ Standard_Real MAT2d_Tool2d::IntersectBisector (
}
}
if (ExtremiteControle) {
if(Bisector1->StartPoint().Distance(PointSolution) < Tolerance ||
Bisector2->StartPoint().Distance(PointSolution) < Tolerance )
//if (ExtremiteControle) {
// if(Bisector1->StartPoint().Distance(PointSolution) < Tolerance ||
// Bisector2->StartPoint().Distance(PointSolution) < Tolerance )
// return Precision::Infinite();
//}
if(ExtremiteControle)
{
if(Bisector1->StartPoint().Distance(PointSolution) < Tolerance)
{
#ifdef DRAW
if(AffichBis)
{
DrawTrSurf::Set("Bis1", Bisector1);
DrawTrSurf::Set("Bis2", Bisector2);
}
#endif
return Precision::Infinite();
}
if(Bisector2->StartPoint().Distance(PointSolution) < Tolerance)
{
#ifdef DRAW
if(AffichBis)
{
DrawTrSurf::Set("Bis1", Bisector1);
DrawTrSurf::Set("Bis2", Bisector2);
}
#endif
return Precision::Infinite();
}
}
if(BisectorOne->SecondParameter() < Precision::Infinite() &&
BisectorOne->SecondParameter() < Param1*(1. - Tolerance ))
@ -929,6 +1021,7 @@ Standard_Real MAT2d_Tool2d::IntersectBisector (
BisectorOne->SecondParameter(Param1);
BisectorTwo->FirstParameter (Param2);
#ifdef OCCT_DEBUG
if (Affich) {
cout<<" coordonnees : "<<GeomPnt (IntPnt).X()<<" "
@ -1220,6 +1313,37 @@ IntRes2d_Domain Domain(const Handle(Geom2d_TrimmedCurve)& Bisector1,
return Domain1;
}
//=============================================================================
//function : CheckEnds
//purpose :
//=============================================================================
Standard_Boolean CheckEnds (const Handle(Geom2d_Geometry)& Elt ,
const gp_Pnt2d& PCom ,
const Standard_Real Distance,
const Standard_Real Tol)
{
Handle(Standard_Type) Type = Elt->DynamicType();
Handle(Geom2d_TrimmedCurve) Curve;
if (Type == STANDARD_TYPE(Geom2d_CartesianPoint)) {
return Standard_False;
}
else {
Curve = Handle(Geom2d_TrimmedCurve)::DownCast(Elt);
gp_Pnt2d aPf = Curve->StartPoint();
gp_Pnt2d aPl = Curve->EndPoint();
Standard_Real df = PCom.Distance(aPf);
Standard_Real dl = PCom.Distance(aPl);
if(Abs(df - Distance) <= Tol)
return Standard_True;
if(Abs(dl - Distance) <= Tol)
return Standard_True;
}
return Standard_False;
}
#ifdef OCCT_DEBUG
//==========================================================================
//function : MAT2d_DrawCurve
@ -1284,6 +1408,7 @@ void MAT2d_DrawCurve(const Handle(Geom2d_Curve)& aCurve,
}
#ifdef DRAW
Standard_Integer Indice = 1;
if (Indice == 1) Couleur = Draw_jaune;
else if (Indice == 2) Couleur = Draw_bleu;
else if (Indice == 3) Couleur = Draw_rouge;
@ -1296,8 +1421,8 @@ void MAT2d_DrawCurve(const Handle(Geom2d_Curve)& aCurve,
else
dr = new DrawTrSurf_Curve2d(CurveDraw,Couleur,500);
dout << dr;
dout.Flush();
//dout << dr;
//dout.Flush();
#endif
}

2
tests/blend/buildevol/D9
View File

@ -8,7 +8,7 @@ tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
mkevol result s
updatevol s_5 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
updatevol s_4 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
buildevol
set square 87027.5

2
tests/blend/buildevol/E2
View File

@ -8,7 +8,7 @@ tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
mkevol result s
updatevol s_5 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
updatevol s_6 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
buildevol
set square 81492.8

2
tests/blend/buildevol/E3
View File

@ -8,7 +8,7 @@ tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
mkevol result s
updatevol s_6 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
updatevol s_5 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
buildevol
set square 81299.7

2
tests/blend/simple/I1
View File

@ -7,6 +7,6 @@ pipe s w profile
tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
blend result s 1*SCALE1 s_5
blend result s 1*SCALE1 s_4
set square 91635.9

2
tests/blend/simple/I2
View File

@ -7,6 +7,6 @@ pipe s w profile
tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
blend result s 1*SCALE1 s_5 1*SCALE1 s_2 1*SCALE1 s_1
blend result s 1*SCALE1 s_4 1*SCALE1 s_2 1*SCALE1 s_1
set square 90904.5

2
tests/blend/simple/I4
View File

@ -7,6 +7,6 @@ pipe s w profile
tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
blend result s 1*SCALE1 s_6 1*SCALE1 s_8 1*SCALE1 s_5
blend result s 1*SCALE1 s_6 1*SCALE1 s_9 1*SCALE1 s_4
set square 90939.5

2
tests/blend/simple/I5
View File

@ -7,6 +7,6 @@ pipe s w profile
tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
blend result s 1*SCALE1 s_5
blend result s 1*SCALE1 s_6
set square 81863.7

2
tests/blend/simple/I6
View File

@ -7,6 +7,6 @@ pipe s w profile
tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
blend result s 1*SCALE1 s_5 1*SCALE1 s_8 1*SCALE1 s_6
blend result s 1*SCALE1 s_5 1*SCALE1 s_10 1*SCALE1 s_6
set square 80209.3

2
tests/blend/simple/I7
View File

@ -7,6 +7,6 @@ pipe s w profile
tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
blend result s 1*SCALE1 s_6
blend result s 1*SCALE1 s_5
set square 81743.8

2
tests/blend/simple/I8
View File

@ -7,6 +7,6 @@ pipe s w profile
tscale s 0 0 0 SCALE1
fsameparameter s SCALE1*1.e-7
explode s E
blend result s 1*SCALE1 s_6 1*SCALE1 s_10 1*SCALE1 s_7
blend result s 1*SCALE1 s_5 1*SCALE1 s_8 1*SCALE1 s_7
set square 80586.1

1
tests/blend/simple/P5
View File

@ -4,6 +4,7 @@
#ttranslate s1 s2 5 5 0
#cut s s1 s2
#save s CFI_i1234fis.rle
puts "TODO ?OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_2"
restore [locate_data_file CFI_i1234fis.rle] s
tscale s 0 0 0 SCALE1

1
tests/boolean/bsection/R3
View File

@ -1,4 +1,5 @@
## buc60289
puts "TODO ?OCC24255 ALL: Error : The length of the resulting shape is"
restore [locate_data_file heal-Face1.rle] a
restore [locate_data_file Plan.rle] b

2
tests/bugs/caf/bug21707
View File

@ -31,7 +31,7 @@ GetShape D $Lin2:1:2 L1
NewCommand D
AddDriver D Prism Box PTxyz
set Prism [AddPrism D $Lin2 300 0]
set Prism [AddPrism D $Lin2 300 1]
ComputeFun D $Prism:1
GetShape D $Prism:1:2 Pr

5
tests/bugs/modalg_1/buc60782_1
View File

@ -31,9 +31,10 @@ if { [regexp {OK} $che ] != 1} {
renamevar a result
} else {
puts "OK BUC60782: offset is created"
tpcompound result
compound result_1 a result
}
}
set square 0
set square 4.24716e+006
set 2dviewer 0

2
tests/bugs/modalg_2/bug423_1
View File

@ -15,7 +15,7 @@ mkplane cont cont
nexplode cyl F
ttranslate cont 0 200 0
featdprism cyl cont cont 10 1 1
featdprism cyl cont cont -10 1 1
if [catch {featperformval dprism result 55 cyl_3 } catch_result] {
puts "Faulty OCC423 (case 1): function FEATPERFORMVAL works wrongly"

2
tests/bugs/modalg_4/bug745_10
View File

@ -20,5 +20,5 @@ if { [regexp {WIRE} $list] == 0 } {
renamevar result_1 result
set length 320.442
set length 307.876
set 2dviewer 1

2
tests/bugs/modalg_4/bug829_1
View File

@ -42,6 +42,6 @@ if { [catch { mkoffset result a_1 1 5 } status] } {
}
}
}
set length 0
set length 8577.24
set 2dviewer 0
}

6
tests/bugs/modalg_5/bug23706_1
View File

@ -18,9 +18,9 @@ explode p f
mksurface ss1 p_1
mksurface ss2 p_2
mksurface ss3 p_3
offset o1 ss1 0.1
offset o2 ss2 0.1
offset o3 ss3 0.1
offset o1 ss1 -0.1
offset o2 ss2 -0.1
offset o3 ss3 -0.1
mkface res o2
set info [sprops res]

1
tests/bugs/modalg_5/bug23952_1
View File

@ -3,6 +3,7 @@ puts "TODO ?OCC24156 MacOS: An exception was caught"
puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
puts "TODO OCC24156 MacOS: \\*\\*\\* Abort"
puts "TODO OCC24156 MacOS: ... The exception is"
puts "TODO ?OCC24255 ALL: An exception"
puts "================"
puts "OCC23952"

8
tests/bugs/modalg_5/bug25298_09
View File

@ -17,17 +17,17 @@ if [catch { mkoffset resoffset pp 1 -1. i } ] {
} else {
renamevar resoffset_1 result
set length 32
set length 42
set nb_v_good 5
set nb_e_good 5
set nb_v_good 6
set nb_e_good 7
set nb_w_good 1
set nb_f_good 0
set nb_sh_good 0
set nb_sol_good 0
set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 11
set nb_shape_good 14
display result
fit

2
tests/bugs/modalg_5/bug25704_1
View File

@ -15,7 +15,7 @@ if [catch { mkoffset resoffset a 1 2. } ] {
} else {
renamevar resoffset_1 result
set length 50.2655
set length 75.3982
set nb_v_good 1
set nb_e_good 1

2
tests/bugs/modalg_5/bug25704_2
View File

@ -15,7 +15,7 @@ if [catch { mkoffset resoffset a 1 -3. } ] {
} else {
renamevar resoffset_1 result
set length 81.6814
set length 43.9823
set nb_v_good 1
set nb_e_good 1

2
tests/caf/driver/B6
View File

@ -33,7 +33,7 @@ GetShape D $Lin2:1:2 L1;
#4 Prism (after step #1)
NewCommand D
AddDriver D Prism Box PTxyz
set Prism [AddPrism D $Lin2 300 0]
set Prism [AddPrism D $Lin2 300 1]
ComputeFun D $Prism:1
GetShape D $Prism:1:2 Pr
GetReference D $Prism; ## check is reference set

2
tests/caf/driver/B7
View File

@ -33,7 +33,7 @@ GetShape D $Lin2:1:2 L1;
#4 Prism (after step #1)
NewCommand D
AddDriver D Prism Box PTxyz
set Prism [AddPrism D $Lin2 300 0]
set Prism [AddPrism D $Lin2 300 1]
ComputeFun D $Prism:1
GetShape D $Prism:1:2 Pr
GetReference D $Prism; ## check is reference set

2
tests/caf/named_shape/F6
View File

@ -56,7 +56,7 @@ GetShape D $Lin2:1:2 L1;
#3 Prism
NewCommand D
AddDriver D Prism Box PTxyz
set Prism [AddPrism D $Lin2 300 0]
set Prism [AddPrism D $Lin2 300 1]
ComputeFun D $Prism:1
GetShape D $Prism:1:2 Pr
GetReference D $Prism; ## check is reference set

2
tests/caf/named_shape/F7
View File

@ -54,7 +54,7 @@ GetShape D $Lin2:1:2 L1;
#3 Prism
NewCommand D
AddDriver D Prism Box PTxyz
set Prism [AddPrism D $Lin2 300 0]
set Prism [AddPrism D $Lin2 300 1]
ComputeFun D $Prism:1
GetShape D $Prism:1:2 Pr
GetReference D $Prism; ## check is reference set

2
tests/feat/featdprism/A1
View File

@ -3,7 +3,7 @@ restore [locate_data_file contour.rle] cont
mkplane cont cont
nexplode cyl F
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperform dprism result
set square 93872.9

4
tests/feat/featdprism/A2
View File

@ -3,7 +3,7 @@ restore [locate_data_file contour.rle] cont
mkplane cont cont
nexplode cyl F
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperformval dprism result -100
set square 78539.8
set square 87985.1

2
tests/feat/featdprism/A3
View File

@ -3,7 +3,7 @@ restore [locate_data_file contour.rle] cont
mkplane cont cont
nexplode cyl F
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperformval dprism result 100 cyl_3
set square 87914.5

2
tests/feat/featdprism/A4
View File

@ -4,7 +4,7 @@ mkplane cont cont
nexplode cyl F
ttranslate cont 0 200 0
featdprism cyl cont cont 10 1 1
featdprism cyl cont cont -10 1 1
featperform dprism result cyl_3
set square 93058.7

4
tests/feat/featdprism/A5
View File

@ -4,7 +4,7 @@ mkplane cont cont
nexplode cyl F
ttranslate cont 0 200 0
featdprism cyl cont cont 10 1 1
featdprism cyl cont cont -10 1 1
featperformval dprism result 100
set square 108523
set square 93058.7

2
tests/feat/featdprism/A6
View File

@ -4,7 +4,7 @@ mkplane cont cont
nexplode cyl F
ttranslate cont 0 200 0
featdprism cyl cont cont 10 1 1
featdprism cyl cont cont -10 1 1
featperformval dprism result 55 cyl_3
set square 94944.4

2
tests/feat/featdprism/A9
View File

@ -3,7 +3,7 @@ restore [locate_data_file contour.rle] cont
mkplane cont cont
nexplode cyl F
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperform dprism result cyl_3
set square 93872.9

4
tests/feat/featdprism/B1
View File

@ -4,7 +4,7 @@ mkplane cont cont
nexplode cyl F
ttranslate cont 0 0 -100
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperformval dprism result -100
set square 78539.8
set square 81634.8

2
tests/feat/featdprism/B2
View File

@ -4,7 +4,7 @@ mkplane cont cont
nexplode cyl F
ttranslate cont 0 0 -100
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperform dprism result
set square 83382.4

2
tests/feat/featdprism/B3
View File

@ -9,7 +9,7 @@ ttranslate cont 0 0 -100
#
mksurface surf cyl_3
mkface face surf
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperformval dprism result 100 face
set square 81610.6

2
tests/feat/featdprism/B4
View File

@ -3,7 +3,7 @@ restore [locate_data_file contour.rle] cont
mkplane cont cont
nexplode cyl F
featdprism cyl cont cont 10 0 1
featdprism cyl cont cont -10 0 1
featperform dprism result cyl_3 cyl_3
set square 93872.9

4
tests/feat/featdprism/B5
View File

@ -5,7 +5,7 @@ nexplode cyl F
ttranslate cont 0 0 -100
ttranslate cont 0 200 0
featdprism cyl cont cont 10 1 1
featdprism cyl cont cont -10 1 1
featperformval dprism result 100
set square 108523
set square 103687

2
tests/feat/featdprism/B6
View File

@ -10,7 +10,7 @@ ttranslate cont 0 200 0
#
mksurface surf cyl_3
mkface face surf
featdprism cyl cont cont 10 1 1
featdprism cyl cont cont -10 1 1
featperformval dprism result 55 face
set square 99444.8

2
tests/offset/faces_type_i/M7
View File

@ -7,6 +7,6 @@ polyline profile 0 0 0 10 0 0 5 0 5 0 0 0
mkplane profile profile
pipe s w profile
OFFSETSHAPE -1 {s_2 s_3} $calcul $type
OFFSETSHAPE -1 {s_2 s_4} $calcul $type
set volume 259.68

2
tests/offset/faces_type_i/M9
View File

@ -5,6 +5,6 @@ polyline profile 0 0 0 10 0 0 5 0 5 0 0 0
mkplane profile profile
pipe s w profile
OFFSETSHAPE -1 {s_4 s_5} $calcul $type
OFFSETSHAPE -1 {s_3 s_5} $calcul $type
set volume 445.962

2
tests/offset/wire_closed_inside_0_005/B5
View File

@ -1,3 +1,5 @@
puts "TODO OCC24255 ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_019.brep] s
set length 1030.64

9
tests/offset/wire_closed_inside_0_005/E8
View File

@ -2,11 +2,12 @@ puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO OCC24255 ALL: Faulty shapes in variables"
restore [locate_data_file offset_wire_059.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 322.054
set nbsh_v 551
set nbsh_e 551
set nbsh_w 1

4
tests/offset/wire_closed_inside_0_005/G4
View File

@ -1,7 +1,7 @@
restore [locate_data_file offset_wire_081.brep] s
set length 376.906
set nbsh_v 66
set nbsh_e 66
set nbsh_v 65
set nbsh_e 65
set nbsh_w 1

4
tests/offset/wire_closed_inside_0_005/H3
View File

@ -1,7 +1,7 @@
restore [locate_data_file offset_wire_089.brep] s
set length 896.364
set nbsh_v 18
set nbsh_e 18
set nbsh_v 19
set nbsh_e 19
set nbsh_w 1

16
tests/offset/wire_closed_inside_0_025/A2
View File

@ -1,12 +1,12 @@
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
#puts "TODO ?OCC23068 ALL: An exception was caught"
#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
#puts "TODO ?OCC23748 ALL: Error: Offset is not done."
#puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
restore [locate_data_file offset_wire_003.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 787.515
set nbsh_v 78
set nbsh_e 78
set nbsh_w 1

8
tests/offset/wire_closed_inside_0_025/B2
View File

@ -5,8 +5,8 @@ puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_015.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 549.222
set nbsh_v 55
set nbsh_e 55
set nbsh_w 1

1
tests/offset/wire_closed_inside_0_025/D1
View File

@ -1,6 +1,7 @@
cpulimit 2400
puts "TODO OCC23068 ALL: Error : The offset cannot be built."
puts "TODO OCC23748 ALL: Error: Offset is not done."
#puts "TODO OCC24255 ALL: An exception was caught"
restore [locate_data_file offset_wire_041.brep] s

9
tests/offset/wire_closed_inside_0_025/E8
View File

@ -3,11 +3,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes in variables"
restore [locate_data_file offset_wire_059.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 282.776
set nbsh_v 524
set nbsh_e 524
set nbsh_w 1

9
tests/offset/wire_closed_inside_0_025/F7
View File

@ -2,11 +2,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_2"
restore [locate_data_file offset_wire_067.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 17.5164
set nbsh_v 40
set nbsh_e 40
set nbsh_w 2

9
tests/offset/wire_closed_inside_0_025/G4
View File

@ -2,11 +2,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
restore [locate_data_file offset_wire_081.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 291.991
set nbsh_v 20
set nbsh_e 20
set nbsh_w 1

7
tests/offset/wire_closed_inside_0_025/H3
View File

@ -1,8 +1,7 @@
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
restore [locate_data_file offset_wire_089.brep] s
set length 953.42
set nbsh_v 20
set nbsh_e 20
set length 746.196
set nbsh_v 17
set nbsh_e 17
set nbsh_w 1

2
tests/offset/wire_closed_inside_0_075/A8
View File

@ -8,5 +8,5 @@ restore [locate_data_file offset_wire_012.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set nbsh_w 1

4
tests/offset/wire_closed_inside_0_075/C7
View File

@ -1,7 +1,3 @@
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_4"
puts "TODO OCC23068 ALL: Error : The length of the resulting shape is"
puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG because it must contain"
restore [locate_data_file offset_wire_038.brep] s
set length 223.954

10
tests/offset/wire_closed_inside_0_075/E8
View File

@ -3,11 +3,13 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO ?OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_4"
puts "TODO ?OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_17"
restore [locate_data_file offset_wire_059.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 240.01
set nbsh_v 434
set nbsh_e 434
set nbsh_w 2

9
tests/offset/wire_closed_inside_0_075/F6
View File

@ -2,11 +2,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
#puts "TODO ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_066.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 45.4428
set nbsh_v 52
set nbsh_e 52
set nbsh_w 1

8
tests/offset/wire_closed_inside_0_075/G4
View File

@ -5,8 +5,8 @@ puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_081.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 428.734
set nbsh_v 18
set nbsh_e 18
set nbsh_w 2

7
tests/offset/wire_closed_inside_0_075/H3
View File

@ -1,8 +1,7 @@
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
restore [locate_data_file offset_wire_089.brep] s
set length 1110.06
set nbsh_v 17
set nbsh_e 17
set length 383.716
set nbsh_v 4
set nbsh_e 4
set nbsh_w 1

21
tests/offset/wire_closed_outside_0_005/D1
View File

@ -1,17 +1,20 @@
puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
#puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
#puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
#puts "TODO OCC24255 ALL: An exception was caught"
puts "TODO OCC24255 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Error : The offset cannot be built."
set os "ALL"
if {[array get env os_type] != ""} {
set os $env(os_type)
}
if {
[string compare $os "Mandriva2010" ] != 0
&& [string compare $os "Debian40" ] != 0
&& [string compare $os "Mandriva2008" ] != 0
} {
puts "TODO OCC23068 $os: Error : The resulting shape is WRONG"
}
#if {
# [string compare $os "Mandriva2010" ] != 0
# && [string compare $os "Debian40" ] != 0
# && [string compare $os "Mandriva2008" ] != 0
# } {
# puts "TODO OCC23068 $os: Error : The resulting shape is WRONG"
#}
restore [locate_data_file offset_wire_041.brep] s

4
tests/offset/wire_closed_outside_0_005/E8
View File

@ -8,7 +8,7 @@ puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_059.brep] s
set length 347.204
set nbsh_v 584
set nbsh_e 584
set nbsh_v 583
set nbsh_e 583
set nbsh_w 1

4
tests/offset/wire_closed_outside_0_005/G1
View File

@ -1,7 +1,7 @@
restore [locate_data_file offset_wire_078.brep] s
set length 488.408
set nbsh_v 72
set nbsh_e 72
set nbsh_v 73
set nbsh_e 73
set nbsh_w 1

10
tests/offset/wire_closed_outside_0_025/B7
View File

@ -1,9 +1,9 @@
puts "TODO OCC23068 ALL: Error : big tolerance of shape result_1"
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
#puts "TODO OCC23068 ALL: Error : big tolerance of shape result_1"
#puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
restore [locate_data_file offset_wire_021.brep] s
set length 175.927
set nbsh_v 31
set nbsh_e 31
set length 164.679
set nbsh_v 30
set nbsh_e 30
set nbsh_w 2

10
tests/offset/wire_closed_outside_0_025/E8
View File

@ -3,11 +3,11 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_"
restore [locate_data_file offset_wire_059.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 406.425
set nbsh_v 579
set nbsh_e 579
set nbsh_w 1

9
tests/offset/wire_closed_outside_0_025/F7
View File

@ -3,11 +3,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty"
restore [locate_data_file offset_wire_067.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 32.4572
set nbsh_v 105
set nbsh_e 105
set nbsh_w 1

6
tests/offset/wire_closed_outside_0_025/F8
View File

@ -1,8 +1,8 @@
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
#puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
restore [locate_data_file offset_wire_068.brep] s
set length 1589.9
set nbsh_v 49
set nbsh_e 49
set nbsh_v 48
set nbsh_e 48
set nbsh_w 1

9
tests/offset/wire_closed_outside_0_075/A2
View File

@ -2,11 +2,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_003.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 1613.94
set nbsh_v 98
set nbsh_e 98
set nbsh_w 1

10
tests/offset/wire_closed_outside_0_075/B7
View File

@ -1,9 +1,9 @@
puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
#puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
#puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
restore [locate_data_file offset_wire_021.brep] s
set length 238.72
set nbsh_v 27
set nbsh_e 27
set length 200.958
set nbsh_v 26
set nbsh_e 26
set nbsh_w 1

9
tests/offset/wire_closed_outside_0_075/E8
View File

@ -3,11 +3,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_"
restore [locate_data_file offset_wire_059.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 555.502
set nbsh_v 573
set nbsh_e 573
set nbsh_w 1

10
tests/offset/wire_closed_outside_0_075/F7
View File

@ -3,11 +3,13 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes"
puts "TODO OCC24255 ALL: Error : big tolerance"
restore [locate_data_file offset_wire_067.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 51.8506
set nbsh_v 61
set nbsh_e 61
set nbsh_w 1

9
tests/offset/wire_closed_outside_0_075/H3
View File

@ -3,11 +3,12 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO ALL: Faulty shapes in variables faulty_1 to faulty_10"
restore [locate_data_file offset_wire_089.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 1367.49
set nbsh_v 20
set nbsh_e 20
set nbsh_w 1

4
tests/offset/wire_unclosed_outside_0_005/A7
View File

@ -2,7 +2,7 @@ puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_024.brep] s
set length 40.4005
set nbsh_v 40
set nbsh_e 40
set nbsh_v 44
set nbsh_e 44
set nbsh_w 1

4
tests/offset/wire_unclosed_outside_0_005/B9
View File

@ -3,7 +3,7 @@ puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
restore [locate_data_file offset_wire_071.brep] s
set length 83216
set nbsh_v 205
set nbsh_e 205
set nbsh_v 215
set nbsh_e 215
set nbsh_w 1

9
tests/offset/wire_unclosed_outside_0_005/C1
View File

@ -1,5 +1,10 @@
puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
#puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
#puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
#puts "TODO OCC24255 ALL: An exception was caught"
puts "TODO OCC24255 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Error : The offset cannot be built."
restore [locate_data_file offset_wire_072.brep] s
set length 116267

4
tests/offset/wire_unclosed_outside_0_005/C2
View File

@ -3,7 +3,7 @@ puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
restore [locate_data_file offset_wire_073.brep] s
set length 80332.8
set nbsh_v 214
set nbsh_e 214
set nbsh_v 212
set nbsh_e 212
set nbsh_w 1

4
tests/offset/wire_unclosed_outside_0_005/C4
View File

@ -2,7 +2,7 @@
restore [locate_data_file offset_wire_075.brep] s
set length 308.604
set nbsh_v 88
set nbsh_e 88
set nbsh_v 84
set nbsh_e 84
set nbsh_w 1

8
tests/offset/wire_unclosed_outside_0_025/A1
View File

@ -5,8 +5,8 @@ puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_001.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 9.26702
set nbsh_v 24
set nbsh_e 24
set nbsh_w 1

8
tests/offset/wire_unclosed_outside_0_025/A6
View File

@ -1,9 +1,7 @@
puts "TODO OCC23068 ALL: Error : big tolerance of shape result_2"
puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
restore [locate_data_file offset_wire_022.brep] s
set length 230.726
set nbsh_v 50
set nbsh_e 50
set length 224.208
set nbsh_v 49
set nbsh_e 49
set nbsh_w 2

4
tests/offset/wire_unclosed_outside_0_025/A7
View File

@ -2,7 +2,7 @@ puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_024.brep] s
set length 42.8997
set nbsh_v 40
set nbsh_e 40
set nbsh_v 44
set nbsh_e 44
set nbsh_w 1

10
tests/offset/wire_unclosed_outside_0_025/B9
View File

@ -2,11 +2,13 @@ puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_"
puts "TODO OCC24255 ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_071.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 121794
set nbsh_v 205
set nbsh_e 205
set nbsh_w 1

4
tests/offset/wire_unclosed_outside_0_025/C4
View File

@ -2,7 +2,7 @@
restore [locate_data_file offset_wire_075.brep] s
set length 326.251
set nbsh_v 104
set nbsh_e 104
set nbsh_v 100
set nbsh_e 100
set nbsh_w 1

8
tests/offset/wire_unclosed_outside_0_075/A1
View File

@ -7,8 +7,8 @@ puts "TODO OCC24156 MacOS: Error : The length of the resulting shape is"
puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
restore [locate_data_file offset_wire_001.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 11.6898
set nbsh_v 23
set nbsh_e 23
set nbsh_w 1

9
tests/offset/wire_unclosed_outside_0_075/A6
View File

@ -1,11 +1,8 @@
puts "TODO OCC23068 ALL: Error : big tolerance of shape result_2"
puts "TODO OCC23068 ALL: Error : The length of the resulting shape is"
puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
restore [locate_data_file offset_wire_022.brep] s
set length 238.448
set nbsh_v 40
set nbsh_e 40
set length 215.745
set nbsh_v 39
set nbsh_e 39
set nbsh_w 2

4
tests/offset/wire_unclosed_outside_0_075/A7
View File

@ -2,7 +2,7 @@ puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_024.brep] s
set length 49.1476
set nbsh_v 40
set nbsh_e 40
set nbsh_v 44
set nbsh_e 44
set nbsh_w 1

4
tests/offset/wire_unclosed_outside_0_075/A8
View File

@ -4,6 +4,6 @@ puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
restore [locate_data_file offset_wire_026.brep] s
set length 25688.3
set nbsh_v 319
set nbsh_e 319
set nbsh_v 315
set nbsh_e 315
set nbsh_w 1

11
tests/offset/wire_unclosed_outside_0_075/A9
View File

@ -1,11 +1,12 @@
puts "TODO OCC23068 ALL: Error : The length of the resulting shape is"
puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
#puts "TODO OCC23068 ALL: Error : The length of the resulting shape is"
#puts "TODO OCC23068 ALL: Error : The resulting shape is WRONG"
puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
#puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_027.brep] s
set length 80555.7
set nbsh_v 217
set nbsh_e 217
set length 77744.9
set nbsh_v 204
set nbsh_e 204
set nbsh_w 1

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