Main changes are in "IntWalk_IWalking::TestDeflection(...)" function (IntWalk_IWalking_5.gxx).
Some test cases were corrected according to their new behavior.
Standard_Real aSQDist = aP1.SquareDistance(aP2);
aSQDist = Max(aSQDist, aP1.SquareDistance(Pmid));
aSQDist = Max(aSQDist, aP2.SquareDistance(Pmid));
-
+
Standard_Boolean isMicro = aSQDist*100.0 < Tol;
if((Abs(firstp-lastp)>Precision::PConfusion()) && !isMicro)
Standard_Boolean isMicro = aSQDist*100.0 < Tol;
+ if(isMicro)
+ {//3D-dimension is small. Checking 2D-dimension
+ aSQDist = 0.0;
+ Standard_Real u1f, v1f, u2f, v2f;
+ Standard_Real u1l, v1l, u2l, v2l;
+ Standard_Real u1m, v1m, u2m, v2m;
+
+ WLine->Point(RealToInt(firstp)).Parameters(u1f, v1f, u2f, v2f);
+ WLine->Point(RealToInt(lastp)).Parameters(u1l, v1l, u2l, v2l);
+ WLine->Point(pmid).Parameters(u1m, v1m, u2m, v2m);
+
+ Standard_Real aDelta = u1m - u1f;
+ aSQDist += aDelta*aDelta;
+ aDelta = v1m - v1f;
+ aSQDist += aDelta*aDelta;
+ aDelta = u2m - u2f;
+ aSQDist += aDelta*aDelta;
+ aDelta = v2m - v2f;
+ aSQDist += aDelta*aDelta;
+
+ aDelta = u1m - u1l;
+ aSQDist += aDelta*aDelta;
+ aDelta = v1m - v1l;
+ aSQDist += aDelta*aDelta;
+ aDelta = u2m - u2l;
+ aSQDist += aDelta*aDelta;
+ aDelta = v2m - v2l;
+ aSQDist += aDelta*aDelta;
+
+ isMicro = aSQDist*100.0 < Tol;
+ }
+
if((Abs(firstp-lastp)>Precision::PConfusion()) && !isMicro)
{
Pmid.Parameters(u1,v1,u2,v2);
static Standard_Integer movelaw (Draw_Interpretor& di, Standard_Integer n, const char** a)
{
Standard_Integer
- ii,
- condition=0,
- error_status ;
+ ii,
+ condition=0,
+ error_status ;
Standard_Real u,
- x,
- tolerance,
- tx ;
+ x,
+ tolerance,
+ tx ;
u = Draw::Atof(a[2]);
x = Draw::Atof(a[3]);
tolerance = 1.0e-5 ;
if (n < 5) {
- return 1 ;
+ return 1 ;
}
Handle(Geom2d_BSplineCurve) G2 = DrawTrSurf::GetBSplineCurve2d(a[1]);
if (!G2.IsNull()) {
- tx = Draw::Atof(a[4]) ;
- if (n == 6) {
- condition = Max(Draw::Atoi(a[5]), -1) ;
- condition = Min(condition, G2->Degree()-1) ;
- }
- TColgp_Array1OfPnt2d curve_poles(1,G2->NbPoles()) ;
- TColStd_Array1OfReal law_poles(1,G2->NbPoles()) ;
- TColStd_Array1OfReal law_knots(1,G2->NbKnots()) ;
- TColStd_Array1OfInteger law_mults(1,G2->NbKnots()) ;
-
- G2->Knots(law_knots) ;
- G2->Multiplicities(law_mults) ;
- G2->Poles(curve_poles) ;
- for (ii = 1 ; ii <= G2->NbPoles() ; ii++) {
- law_poles(ii) = curve_poles(ii).Coord(2) ;
- }
+ tx = Draw::Atof(a[4]) ;
+ if (n == 6) {
+ condition = Max(Draw::Atoi(a[5]), -1) ;
+ condition = Min(condition, G2->Degree()-1) ;
+ }
+ TColgp_Array1OfPnt2d curve_poles(1,G2->NbPoles()) ;
+ TColStd_Array1OfReal law_poles(1,G2->NbPoles()) ;
+ TColStd_Array1OfReal law_knots(1,G2->NbKnots()) ;
+ TColStd_Array1OfInteger law_mults(1,G2->NbKnots()) ;
+
+ G2->Knots(law_knots) ;
+ G2->Multiplicities(law_mults) ;
+ G2->Poles(curve_poles) ;
+ for (ii = 1 ; ii <= G2->NbPoles() ; ii++) {
+ law_poles(ii) = curve_poles(ii).Coord(2) ;
+ }
- Law_BSpline a_law(law_poles,
- law_knots,
- law_mults,
- G2->Degree(),
- Standard_False) ;
-
- a_law.MovePointAndTangent(u,
- x,
- tx,
- tolerance,
- condition,
- condition,
- error_status) ;
-
- for (ii = 1 ; ii <= G2->NbPoles() ; ii++) {
- curve_poles(ii).SetCoord(2,a_law.Pole(ii)) ;
- G2->SetPole(ii,curve_poles(ii)) ;
- }
+ Law_BSpline a_law(law_poles,
+ law_knots,
+ law_mults,
+ G2->Degree(),
+ Standard_False) ;
+
+ a_law.MovePointAndTangent(u,
+ x,
+ tx,
+ tolerance,
+ condition,
+ condition,
+ error_status) ;
+
+ for (ii = 1 ; ii <= G2->NbPoles() ; ii++) {
+ curve_poles(ii).SetCoord(2,a_law.Pole(ii)) ;
+ G2->SetPole(ii,curve_poles(ii)) ;
+ }
-
- if (! error_status) {
- Draw::Repaint();
- }
- else {
- di << "Not enought degree of freedom increase degree please" << "\n";
- }
-
-
+
+ if (! error_status) {
+ Draw::Repaint();
}
+ else {
+ di << "Not enought degree of freedom increase degree please" << "\n";
+ }
+
+
+ }
return 0;
}
//function : intersect
//purpose :
//=======================================================================
-static Standard_Integer intersection (Draw_Interpretor& di, Standard_Integer n, const char** a)
- {
+static Standard_Integer intersection (Draw_Interpretor& di,
+ Standard_Integer n, const char** a)
+{
if (n < 4)
return 1;
-
+
//
Handle(Geom_Curve) GC1;
Handle(Geom_Surface) GS1 = DrawTrSurf::GetSurface(a[2]);
if (GS1.IsNull())
- {
+ {
GC1 = DrawTrSurf::GetCurve(a[2]);
if (GC1.IsNull())
return 1;
- }
+ }
//
Handle(Geom_Surface) GS2 = DrawTrSurf::GetSurface(a[3]);
//
Handle(Geom_Curve) Result;
gp_Pnt Point;
-
+
//
if (GC1.IsNull())
- {
+ {
GeomInt_IntSS Inters;
//
// Surface Surface
if (n <= 5)
- {
+ {
// General case
Inters.Perform(GS1,GS2,tol,Standard_True);
- }
+ }
else if (n == 8 || n == 9 || n == 12 || n == 13 || n == 16 || n == 17)
- {
+ {
Standard_Boolean useStart = Standard_True, useBnd = Standard_True;
Standard_Integer ista1=0,ista2=0,ibnd1=0,ibnd2=0;
Standard_Real UVsta[4];
Handle(GeomAdaptor_HSurface) AS1,AS2;
-
+
//
if (n <= 9) // user starting point
- {
+ {
useBnd = Standard_False;
ista1 = 4;
ista2 = 7;
- }
+ }
else if (n <= 13) // user bounding
- {
+ {
useStart = Standard_False;
ibnd1 = 4; ibnd2 = 11;
- }
+ }
else // both user starting point and bounding
- {
+ {
ista1 = 4; ista2 = 7;
ibnd1 = 8; ibnd2 = 15;
- }
+ }
if (useStart)
- {
+ {
for (Standard_Integer i=ista1; i <= ista2; i++)
- {
+ {
UVsta[i-ista1] = Draw::Atof(a[i]);
- }
}
+ }
if (useBnd)
- {
+ {
Standard_Real UVbnd[8];
for (Standard_Integer i=ibnd1; i <= ibnd2; i++)
UVbnd[i-ibnd1] = Draw::Atof(a[i]);
AS1 = new GeomAdaptor_HSurface(GS1,UVbnd[0],UVbnd[1],UVbnd[2],UVbnd[3]);
AS2 = new GeomAdaptor_HSurface(GS2,UVbnd[4],UVbnd[5],UVbnd[6],UVbnd[7]);
- }
+ }
//
if (useStart && !useBnd)
- {
+ {
Inters.Perform(GS1,GS2,tol,UVsta[0],UVsta[1],UVsta[2],UVsta[3]);
- }
+ }
else if (!useStart && useBnd)
- {
+ {
Inters.Perform(AS1,AS2,tol);
- }
+ }
else
- {
+ {
Inters.Perform(AS1,AS2,tol,UVsta[0],UVsta[1],UVsta[2],UVsta[3]);
- }
- }//else if (n == 8 || n == 9 || n == 12 || n == 13 || n == 16 || n == 17)
+ }
+ }//else if (n == 8 || n == 9 || n == 12 || n == 13 || n == 16 || n == 17)
else
- {
+ {
di<<"incorrect number of arguments"<<"\n";
return 1;
- }
+ }
//
if (!Inters.IsDone())
- {
+ {
di<<"No intersections found!"<<"\n";
return 1;
- }
-
+ }
+
//
char buf[1024];
Standard_Integer i, aNbLines, aNbPoints;
-
+
//
aNbLines = Inters.NbLines();
if (aNbLines >= 2)
- {
+ {
for (i=1; i<=aNbLines; ++i)
- {
+ {
Sprintf(buf, "%s_%d",a[1],i);
di << buf << " ";
Result = Inters.Line(i);
const char* temp = buf;
DrawTrSurf::Set(temp,Result);
- }
}
+ }
else if (aNbLines == 1)
- {
+ {
Result = Inters.Line(1);
Sprintf(buf,"%s",a[1]);
di << buf << " ";
//
aNbPoints=Inters.NbPoints();
for (i=1; i<=aNbPoints; ++i)
- {
+ {
Point=Inters.Point(i);
Sprintf(buf,"%s_p_%d",a[1],i);
di << buf << " ";
const char* temp = buf;
DrawTrSurf::Set(temp, Point);
- }
- }// if (GC1.IsNull())
+ }
+ }// if (GC1.IsNull())
else
- {
+ {
// Curve Surface
GeomAPI_IntCS Inters(GC1,GS2);
-
+
//
if (!Inters.IsDone())
- {
+ {
di<<"No intersections found!"<<"\n";
return 1;
- }
+ }
Standard_Integer nblines = Inters.NbSegments();
Standard_Integer nbpoints = Inters.NbPoints();
char newname[1024];
if ( (nblines+nbpoints) >= 2)
- {
+ {
Standard_Integer i;
Standard_Integer Compt = 1;
cout << " Lines: " << endl;
for (i = 1; i <= nblines; i++, Compt++)
- {
+ {
Sprintf(newname,"%s_%d",a[1],Compt);
di << newname << " ";
Result = Inters.Segment(i);
const char* temp = newname; // pour portage WNT
DrawTrSurf::Set(temp,Result);
- }
+ }
if(nbpoints >= 1)
cout << " Points: " << endl;
const Standard_Integer imax = nblines+nbpoints;
for (/*i = 1*/; i <= imax; i++, Compt++)
- {
+ {
Sprintf(newname,"%s_%d",a[1],i);
di << newname << " ";
Point = Inters.Point(i);
const char* temp = newname; // pour portage WNT
DrawTrSurf::Set(temp,Point);
- }
}
+ }
else if (nblines == 1)
- {
+ {
Result = Inters.Segment(1);
Sprintf(newname,"%s",a[1]);
di << newname << " ";
DrawTrSurf::Set(a[1],Result);
- }
+ }
else if (nbpoints == 1)
- {
+ {
Point = Inters.Point(1);
Sprintf(newname,"%s",a[1]);
di << newname << " ";
DrawTrSurf::Set(a[1],Point);
- }
}
+ }
dout.Flush();
return 0;
- }
+}
//=======================================================================
//function : CurveCommands
d3d.SetLinearForm(tgdu,d1u,tgdv,d1v);
d2d = gp_Dir2d(tgdu, tgdv);
if (d3d.Magnitude() <= Tolpetit) { // jag
- tangent = Standard_True;
+ tangent = Standard_True;
}
}
}
if (!empt)
{
- for(Standard_Integer i = 1; i <= interip.NbLines(); i++)
+ const Standard_Integer aNbLines = interip.NbLines();
+ for(Standard_Integer i = 1; i <= aNbLines; i++)
{
if(interip.Line(i)->ArcType() != IntPatch_Walking)
slin.Append(interip.Line(i));
}
- for(Standard_Integer i = 1; i <= interip.NbLines(); i++)
+ for(Standard_Integer i = 1; i <= aNbLines; i++)
{
if(interip.Line(i)->ArcType() == IntPatch_Walking)
slin.Append(interip.Line(i));
previousd2d : Dir2d from gp;
seqAjout : SequenceOfInteger from TColStd;
lines : SequenceOfIWLine;
- NbPointsConfondusConsecutifs: Integer from Standard;
- EpsilonSembleTropGrand : Integer from Standard;
end IWalking;
epsilon(Epsilon*Epsilon),
wd1 (IntWalk_VectorOfWalkingData::allocator_type (new NCollection_IncAllocator)),
wd2 (wd1.get_allocator()),
- nbMultiplicities (wd1.get_allocator()),
- NbPointsConfondusConsecutifs(0),
- EpsilonSembleTropGrand(0)
+ nbMultiplicities (wd1.get_allocator())
{
}
Func.Set(Caro);
// calculation of all open lines
- if (nbPnts1 != 0) ComputeOpenLine(Umult,Vmult,Pnts1,Func,Rajout);
+ if (nbPnts1 != 0)
+ ComputeOpenLine(Umult,Vmult,Pnts1,Func,Rajout);
+
// calculation of all closed lines
- if (nbPnts2 != 0) ComputeCloseLine(Umult,Vmult,Pnts1,Pnts2,Func,Rajout);
+ if (nbPnts2 != 0)
+ ComputeCloseLine(Umult,Vmult,Pnts1,Pnts2,Func,Rajout);
+
for (I = 1; I <= nbPnts1; I++) {
if (wd1[I].etat >0) seqSingle.Append(Pnts1(I));
}
CurrentLine->AddPoint(previousPoint);
// modified by NIZHNY-MKK Fri Oct 27 12:34:32 2000.BEGIN
if(movementdirectioninfo[I] !=0) {
- if(movementdirectioninfo[I] < 0) {
- StepSign = -1;
- CurrentLine->SetTangentVector(previousd3d.Reversed(),1);
- } else {
- StepSign = 1;
- CurrentLine->SetTangentVector(previousd3d,1);
- }
+ if(movementdirectioninfo[I] < 0) {
+ StepSign = -1;
+ CurrentLine->SetTangentVector(previousd3d.Reversed(),1);
+ } else {
+ StepSign = 1;
+ CurrentLine->SetTangentVector(previousd3d,1);
+ }
} else {
- Standard_Real tyutuyt=ThePointOfPathTool::Direction3d(PathPnt) * previousd3d;
- if( tyutuyt < 0) {
- StepSign = -1;
- CurrentLine->SetTangentVector(previousd3d.Reversed(),1);
- }
- else {
- StepSign = 1;
- CurrentLine->SetTangentVector(previousd3d,1);
- }
+ Standard_Real tyutuyt=ThePointOfPathTool::Direction3d(PathPnt) * previousd3d;
+ if( tyutuyt < 0) {
+ StepSign = -1;
+ CurrentLine->SetTangentVector(previousd3d.Reversed(),1);
+ }
+ else {
+ StepSign = 1;
+ CurrentLine->SetTangentVector(previousd3d,1);
+ }
}
// modified by NIZHNY-MKK Fri Oct 27 12:34:37 2000.END
-// Modified by Sergey KHROMOV - Tue Nov 20 10:41:45 2001 Begin
+ // Modified by Sergey KHROMOV - Tue Nov 20 10:41:45 2001 Begin
wd1[I].etat = - abs(wd1[I].etat);
movementdirectioninfo[I] = (movementdirectioninfo[I]==0) ? StepSign : 0;
// Modified by Sergey KHROMOV - Tue Nov 20 10:41:56 2001 End
Standard_Real d2dx = Abs(previousd2d.X());
Standard_Real d2dy = Abs(previousd2d.Y());
if (d2dx < tolerance(1)) {
- PasC = pas * (VM-Vm)/d2dy;
+ PasC = pas * (VM-Vm)/d2dy;
}
else if (d2dy < tolerance(2)) {
- PasC = pas * (UM-Um)/d2dx;
+ PasC = pas * (UM-Um)/d2dx;
}
else {
- PasC = pas * Min((UM-Um)/d2dx,(VM-Vm)/d2dy);
+ PasC = pas * Min((UM-Um)/d2dx,(VM-Vm)/d2dy);
}
Arrive = Standard_False;
StatusPrecedent = IntWalk_OK;
// modified by NIZHNY-MKK Fri Oct 27 12:39:37 2000
Standard_Integer IndexOfPathPointDoNotCheck=0;
-
+ Standard_Integer aNbIter = 10;
while (!Arrive) { // as one of stop tests is not checked
-
- Cadre = Cadrage(BornInf,BornSup,UVap,PasC,StepSign);
- // Border?
+ Cadre = Cadrage(BornInf,BornSup,UVap,PasC,StepSign);
+ // Border?
#ifdef CHRONO
- Chronrsnld.Start();
+ Chronrsnld.Start();
#endif
- Rsnld.Perform(Func,UVap,BornInf,BornSup);
+ Rsnld.Perform(Func,UVap,BornInf,BornSup);
#ifdef CHRONO
- Chronrsnld.Stop();
+ Chronrsnld.Stop();
#endif
- if (Cadre) {
- BornInf(1) = Um; BornSup(1) = UM; BornInf(2) = Vm; BornSup(2) = VM;
- }
- if (Rsnld.IsDone()) {
- if (Abs(Func.Root()) > Func.Tolerance()) {
- PasC = PasC / 2.0;
- PasCu = Abs(PasC*previousd2d.X());
- PasCv = Abs(PasC*previousd2d.Y());
- if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
- if (CurrentLine->NbPoints() == 1) break;
- Arrive = Standard_True;
- CurrentLine->AddStatusLast(Standard_False);
- Tgtend = Standard_True; // check
+ if (Cadre) {
+ BornInf(1) = Um; BornSup(1) = UM; BornInf(2) = Vm; BornSup(2) = VM;
+ }
+ if (Rsnld.IsDone()) {
+ if (Abs(Func.Root()) > Func.Tolerance()) {
+ PasC = PasC / 2.0;
+ PasCu = Abs(PasC*previousd2d.X());
+ PasCv = Abs(PasC*previousd2d.Y());
+ if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
+ if (CurrentLine->NbPoints() == 1) break;
+ Arrive = Standard_True;
+ CurrentLine->AddStatusLast(Standard_False);
+ Tgtend = Standard_True; // check
Rajout = Standard_True;
- seqAjout.Append(lines.Length() + 1);
- }
- }
- else { // test stop
- Rsnld.Root(UVap);
- Arrive = TestArretPassage(Umult, Vmult, Func, UVap, N);
- if (Arrive) {
- Cadre = Standard_False;
- //in case if there is a frame and arrive at the same time
- }
- else {
- if (Rajout) {
- ArretAjout =TestArretAjout(Func, UVap, N, Psol);
- if (ArretAjout) {
- // jag 940615
- Tgtend = lines.Value(N)->IsTangentAtEnd();
- N = -N;
- }
- }
- // modified by NIZHNY-MKK Thu Nov 2 15:09:08 2000.BEGIN
- if(!(Rajout && ArretAjout)) {
- Standard_Real prevUp, prevVp;
- if (!reversed) {
- previousPoint.ParametersOnS2(prevUp, prevVp);
- }
- else {
- previousPoint.ParametersOnS1(prevUp, prevVp);
- }
- Arrive = TestPassedSolutionWithNegativeState(wd1, Umult, Vmult, prevUp, prevVp,
- nbMultiplicities, tolerance, Func, UVap, N);
- if(Arrive) {
- Cadre = Standard_False;
- }
- }
- // modified by NIZHNY-MKK Thu Nov 2 15:09:13 2000.END
- if (!ArretAjout && Cadre) {
- if (CurrentLine->NbPoints() == 1) break; // cancel the line
- TestArretCadre(Umult, Vmult, CurrentLine, Func, UVap, N);
-// if (N == 0) {
- if (N <= 0) { // jag 941017
- MakeWalkingPoint(2, UVap(1), UVap(2), Func, Psol);
- Tgtend = Func.IsTangent();
+ seqAjout.Append(lines.Length() + 1);
+ }
+ }
+ else { // test stop
+ Rsnld.Root(UVap);
+ Arrive = TestArretPassage(Umult, Vmult, Func, UVap, N);
+ if (Arrive) {
+ Cadre = Standard_False;
+ //in case if there is a frame and arrive at the same time
+ }
+ else {
+ if (Rajout) {
+ ArretAjout =TestArretAjout(Func, UVap, N, Psol);
+ if (ArretAjout) {
+ // jag 940615
+ Tgtend = lines.Value(N)->IsTangentAtEnd();
N = -N;
- }
- }
- }
- Status = TestDeflection(Func, Arrive, UVap, StatusPrecedent,
- NbDivision,PasC,StepSign);
- StatusPrecedent = Status;
- if (Status == IntWalk_PasTropGrand) {
- Arrive = Standard_False;
- ArretAjout = Standard_False;
- Tgtend = Standard_False; // jag 940615
- if (!reversed) {
- previousPoint.ParametersOnS2(UVap(1), UVap(2));
- }
- else {
- previousPoint.ParametersOnS1(UVap(1), UVap(2));
- }
- }
- else if (ArretAjout || Cadre) {
- Arrive = Standard_True;
- CurrentLine->AddStatusLast(Standard_False);
- if (Status != IntWalk_ArretSurPointPrecedent) {
- CurrentLine->AddPoint(Psol);
- }
- if (Cadre && N==0) {
- Rajout = Standard_True;
- seqAjout.Append(lines.Length()+1);
- }
- }
- else if (Status == IntWalk_ArretSurPointPrecedent) {
- if (CurrentLine->NbPoints() == 1) { //cancel the line
- Arrive = Standard_False;
- break;
- }
- Arrive = Standard_True;
- Rajout = Standard_True;
+ }
+ }
+ // modified by NIZHNY-MKK Thu Nov 2 15:09:08 2000.BEGIN
+ if(!(Rajout && ArretAjout)) {
+ Standard_Real prevUp, prevVp;
+ if (!reversed) {
+ previousPoint.ParametersOnS2(prevUp, prevVp);
+ }
+ else {
+ previousPoint.ParametersOnS1(prevUp, prevVp);
+ }
+ Arrive = TestPassedSolutionWithNegativeState(wd1, Umult, Vmult, prevUp, prevVp,
+ nbMultiplicities, tolerance, Func, UVap, N);
+ if(Arrive) {
+ Cadre = Standard_False;
+ }
+ }
+ // modified by NIZHNY-MKK Thu Nov 2 15:09:13 2000.END
+ if (!ArretAjout && Cadre) {
+ if (CurrentLine->NbPoints() == 1) break; // cancel the line
+ TestArretCadre(Umult, Vmult, CurrentLine, Func, UVap, N);
+ // if (N == 0) {
+ if (N <= 0) { // jag 941017
+ MakeWalkingPoint(2, UVap(1), UVap(2), Func, Psol);
+ Tgtend = Func.IsTangent();
+ N = -N;
+ }
+ }
+ }
+ Status = TestDeflection(Func, Arrive, UVap, StatusPrecedent,
+ NbDivision,PasC,StepSign);
+ StatusPrecedent = Status;
+ if (Status == IntWalk_PasTropGrand) {
+ Arrive = Standard_False;
+ ArretAjout = Standard_False;
+ Tgtend = Standard_False; // jag 940615
+ if (!reversed) {
+ previousPoint.ParametersOnS2(UVap(1), UVap(2));
+ }
+ else {
+ previousPoint.ParametersOnS1(UVap(1), UVap(2));
+ }
+ }
+ else if (ArretAjout || Cadre) {
+ Arrive = Standard_True;
+ CurrentLine->AddStatusLast(Standard_False);
+ if (Status != IntWalk_ArretSurPointPrecedent) {
+ CurrentLine->AddPoint(Psol);
+ }
+ if (Cadre && N==0) {
+ Rajout = Standard_True;
+ seqAjout.Append(lines.Length()+1);
+ }
+ }
+ else if (Status == IntWalk_ArretSurPointPrecedent) {
+ if (CurrentLine->NbPoints() == 1) { //cancel the line
+ Arrive = Standard_False;
+ break;
+ }
+ Arrive = Standard_True;
+ Rajout = Standard_True;
seqAjout.Append(lines.Length() + 1);
- CurrentLine->AddStatusLast(Standard_False);
- Tgtend = Standard_True; // check
- }
- else if (Arrive) {
- if (CurrentLine->NbPoints() == 1 && // cancel the line
- (N == I || Status == IntWalk_PointConfondu) ) {
- // if N == I the main uv is probably lost
- // or the point is a point of accumulation
- // if point is confused the start data is bad
- Arrive = Standard_False;
- break;
- }
- // necessairily N > 0 jag 940617
+ CurrentLine->AddStatusLast(Standard_False);
+ Tgtend = Standard_True; // check
+ }
+ else if (Arrive) {
+ if (CurrentLine->NbPoints() == 1 && // cancel the line
+ (N == I || Status == IntWalk_PointConfondu) ) {
+ // if N == I the main uv is probably lost
+ // or the point is a point of accumulation
+ // if point is confused the start data is bad
+ Arrive = Standard_False;
+ break;
+ }
+ // necessairily N > 0 jag 940617
// point of stop given at input
- PathPnt = Pnts1.Value(N);
-
- Standard_Integer etat1N=wd1[N].etat;
- // modified by NIZHNY-MKK Thu Nov 2 15:09:51 2000.BEGIN
- // if (etat1N < 11) { // passing point that is a stop
- if (Abs(etat1N) < 11) { // passing point that is a stop
- // modified by NIZHNY-MKK Thu Nov 2 15:12:11 2000.END
- if (Status == IntWalk_ArretSurPoint) {
- CurrentLine->AddStatusLast(Standard_False);
- Tgtend = Standard_True; // need check
- }
- else {
- Arrive = Standard_False;
- }
- CurrentLine->AddIndexPassing(N);
- }
- else { // point of stop given at input
- if (etat1N == 11) {
- Tgtend = Standard_True;
- }
- CurrentLine->AddStatusLast(Standard_True, N, PathPnt);
- }
- AddPointInCurrentLine(N,PathPnt,CurrentLine);
- if ((etat1N != 1 && etat1N != 11)) {
- // modified by NIZHNY-MKK Fri Oct 27 12:43:05 2000.BEGIN
- // wd1[N].etat= - wd1[N].etat;
- wd1[N].etat = - Abs(etat1N);
- movementdirectioninfo[N] = (movementdirectioninfo[N]==0) ? StepSign : 0;
- if(Arrive && movementdirectioninfo[N]!=0) {
- IndexOfPathPointDoNotCheck = N;
- }
+ PathPnt = Pnts1.Value(N);
- if(Arrive) {
- Rajout = Standard_True;
- seqAjout.Append(lines.Length() + 1);
- }
- // modified by NIZHNY-MKK Fri Oct 27 12:45:33 2000.END
- }
- }
- else if (Status == IntWalk_ArretSurPoint) {
- Arrive = Standard_True;
- CurrentLine->AddStatusLast(Standard_False);
- Tgtend = Standard_True;
+ Standard_Integer etat1N=wd1[N].etat;
+ // modified by NIZHNY-MKK Thu Nov 2 15:09:51 2000.BEGIN
+ // if (etat1N < 11) { // passing point that is a stop
+ if (Abs(etat1N) < 11) { // passing point that is a stop
+ // modified by NIZHNY-MKK Thu Nov 2 15:12:11 2000.END
+ if (Status == IntWalk_ArretSurPoint) {
+ CurrentLine->AddStatusLast(Standard_False);
+ Tgtend = Standard_True; // need check
+ }
+ else {
+ Arrive = Standard_False;
+ }
+ CurrentLine->AddIndexPassing(N);
+ }
+ else { // point of stop given at input
+ if (etat1N == 11) {
+ Tgtend = Standard_True;
+ }
+ CurrentLine->AddStatusLast(Standard_True, N, PathPnt);
+ }
+ AddPointInCurrentLine(N,PathPnt,CurrentLine);
+ if ((etat1N != 1 && etat1N != 11)) {
+ // modified by NIZHNY-MKK Fri Oct 27 12:43:05 2000.BEGIN
+ // wd1[N].etat= - wd1[N].etat;
+ wd1[N].etat = - Abs(etat1N);
+ movementdirectioninfo[N] = (movementdirectioninfo[N]==0) ? StepSign : 0;
+ if(Arrive && movementdirectioninfo[N]!=0) {
+ IndexOfPathPointDoNotCheck = N;
+ }
+
+ if(Arrive) {
+ Rajout = Standard_True;
+ seqAjout.Append(lines.Length() + 1);
+ }
+ // modified by NIZHNY-MKK Fri Oct 27 12:45:33 2000.END
+ }
+ }
+ else if (Status == IntWalk_ArretSurPoint) {
+ Arrive = Standard_True;
+ CurrentLine->AddStatusLast(Standard_False);
+ Tgtend = Standard_True;
MakeWalkingPoint(1, UVap(1), UVap(2), Func, Psol);
- CurrentLine->AddPoint(Psol);
- Rajout = Standard_True;
+ CurrentLine->AddPoint(Psol);
+ Rajout = Standard_True;
seqAjout.Append(lines.Length() + 1);
- }
- else if (Status == IntWalk_OK) {
+ }
+ else if (Status == IntWalk_OK) {
MakeWalkingPoint(2, UVap(1), UVap(2), Func, previousPoint);
- previousd3d = Func.Direction3d();
- previousd2d = Func.Direction2d();
- CurrentLine->AddPoint(previousPoint);
- }
- }
- }
- else { // no numerical solution
- PasC = PasC / 2.;
- PasCu = Abs(PasC*previousd2d.X());
- PasCv = Abs(PasC*previousd2d.Y());
- if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
- if (CurrentLine->NbPoints()==1) break;
- Arrive = Standard_True;
- CurrentLine->AddStatusLast(Standard_False);
- Tgtend = Standard_True; // need check
- Rajout = Standard_True;
+ previousd3d = Func.Direction3d();
+ previousd2d = Func.Direction2d();
+ CurrentLine->AddPoint(previousPoint);
+ }
+ else if (Status == IntWalk_PointConfondu)
+ {
+ aNbIter --;
+ }
+ }
+ }
+ else { // no numerical solution
+ PasC = PasC / 2.;
+ PasCu = Abs(PasC*previousd2d.X());
+ PasCv = Abs(PasC*previousd2d.Y());
+ if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
+ if (CurrentLine->NbPoints()==1) break;
+ Arrive = Standard_True;
+ CurrentLine->AddStatusLast(Standard_False);
+ Tgtend = Standard_True; // need check
+ Rajout = Standard_True;
seqAjout.Append(lines.Length() + 1);
- }
- }
+ }
+ }
+
+ if(aNbIter < 0)
+ break;
} // end of started line
if (Arrive) {
- CurrentLine->SetTangencyAtEnd(Tgtend);
- lines.Append(CurrentLine);
- // modified by NIZHNY-MKK Fri Oct 27 12:59:29 2000.BEGIN
- movementdirectioninfo[I]=0;
- if(wd1[I].etat > 0)
- // modified by NIZHNY-MKK Fri Oct 27 12:59:42 2000.END
- wd1[I].etat=-wd1[I].etat;
+ CurrentLine->SetTangencyAtEnd(Tgtend);
+ lines.Append(CurrentLine);
+ // modified by NIZHNY-MKK Fri Oct 27 12:59:29 2000.BEGIN
+ movementdirectioninfo[I]=0;
+ if(wd1[I].etat > 0)
+ // modified by NIZHNY-MKK Fri Oct 27 12:59:42 2000.END
+ wd1[I].etat=-wd1[I].etat;
- //-- lbr le 5 juin 97 (Pb ds Contap)
- for(Standard_Integer av=1; av<=nbPath; av++) {
- // modified by NIZHNY-MKK Fri Oct 27 13:00:22 2000.BEGIN
- // if (wd1[av].etat > 11) {
- if ((wd1[av].etat > 11) ||
- ((av!=I) &&
- (av!=IndexOfPathPointDoNotCheck) &&
- (wd1[av].etat < -11) &&
- (movementdirectioninfo[av]!=0))) {
- // modified by NIZHNY-MKK Fri Oct 27 13:00:26 2000.END
- Standard_Real Uav=wd1[av].ustart;
- Standard_Real Vav=wd1[av].vstart;
- Standard_Real Uavp,Vavp;
- const IntSurf_PntOn2S &avP=CurrentLine->Value(CurrentLine->NbPoints());
- if (!reversed) {
- avP.ParametersOnS2(Uavp,Vavp);
- }
- else {
- avP.ParametersOnS1(Uavp,Vavp);
- }
- Uav-=Uavp;
- Vav-=Vavp;
- Uav*=0.001; Vav*=0.001;
- if(Abs(Uav)<tolerance(1) && Abs(Vav)<tolerance(2)) {
- // modified by NIZHNY-MKK Fri Oct 27 13:01:38 2000.BEGIN
- // wd1[av].etat=-wd1[av].etat;
- if(wd1[av].etat < 0) {
- movementdirectioninfo[av] = 0;
- } else {
- wd1[av].etat=-wd1[av].etat;
- movementdirectioninfo[av] = StepSign;
- }
- // modified by NIZHNY-MKK Fri Oct 27 13:01:42 2000.END
- CurrentLine->AddStatusLast(Standard_True, av, Pnts1.Value(av));
- //-- cout<<"\n Debug ? lbr ds IntWalk_IWalking_3.gxx"<<endl;
- }
-
- const IntSurf_PntOn2S &avPP=CurrentLine->Value(1);
- if (!reversed) {
- avPP.ParametersOnS2(Uavp,Vavp);
- }
- else {
- avPP.ParametersOnS1(Uavp,Vavp);
- }
- Uav=wd1[av].ustart;
- Vav=wd1[av].vstart;
- Uav-=Uavp;
- Vav-=Vavp;
- Uav*=0.001; Vav*=0.001;
- if(Abs(Uav)<tolerance(1) && Abs(Vav)<tolerance(2)) {
- // modified by NIZHNY-MKK Fri Oct 27 13:02:49 2000.BEGIN
- // wd1[av].etat=-wd1[av].etat;
- if(wd1[av].etat < 0) {
- movementdirectioninfo[av] = 0;
- } else {
- wd1[av].etat=-wd1[av].etat;
- movementdirectioninfo[av] = -StepSign;
- }
- // modified by NIZHNY-MKK Fri Oct 27 13:02:52 2000.END
- //-- cout<<"\n Debug ? lbr ds IntWalk_IWalking_3.gxx"<<endl;
- CurrentLine->AddStatusFirst(Standard_False, Standard_True, av, Pnts1.Value(av));
- }
- }
- }
-
+ //-- lbr le 5 juin 97 (Pb ds Contap)
+ for(Standard_Integer av=1; av<=nbPath; av++) {
+ // modified by NIZHNY-MKK Fri Oct 27 13:00:22 2000.BEGIN
+ // if (wd1[av].etat > 11) {
+ if ((wd1[av].etat > 11) ||
+ ((av!=I) &&
+ (av!=IndexOfPathPointDoNotCheck) &&
+ (wd1[av].etat < -11) &&
+ (movementdirectioninfo[av]!=0)))
+ {
+ // modified by NIZHNY-MKK Fri Oct 27 13:00:26 2000.END
+ Standard_Real Uav=wd1[av].ustart;
+ Standard_Real Vav=wd1[av].vstart;
+ Standard_Real Uavp,Vavp;
+ const IntSurf_PntOn2S &avP=CurrentLine->Value(CurrentLine->NbPoints());
+ if (!reversed) {
+ avP.ParametersOnS2(Uavp,Vavp);
+ }
+ else {
+ avP.ParametersOnS1(Uavp,Vavp);
+ }
+ Uav-=Uavp;
+ Vav-=Vavp;
+ Uav*=0.001; Vav*=0.001;
+ if(Abs(Uav)<tolerance(1) && Abs(Vav)<tolerance(2)) {
+ // modified by NIZHNY-MKK Fri Oct 27 13:01:38 2000.BEGIN
+ // wd1[av].etat=-wd1[av].etat;
+ if(wd1[av].etat < 0) {
+ movementdirectioninfo[av] = 0;
+ } else {
+ wd1[av].etat=-wd1[av].etat;
+ movementdirectioninfo[av] = StepSign;
+ }
+ // modified by NIZHNY-MKK Fri Oct 27 13:01:42 2000.END
+ CurrentLine->AddStatusLast(Standard_True, av, Pnts1.Value(av));
+ //-- cout<<"\n Debug ? lbr ds IntWalk_IWalking_3.gxx"<<endl;
+ }
+
+ const IntSurf_PntOn2S &avPP=CurrentLine->Value(1);
+ if (!reversed) {
+ avPP.ParametersOnS2(Uavp,Vavp);
+ }
+ else {
+ avPP.ParametersOnS1(Uavp,Vavp);
+ }
+ Uav=wd1[av].ustart;
+ Vav=wd1[av].vstart;
+ Uav-=Uavp;
+ Vav-=Vavp;
+ Uav*=0.001; Vav*=0.001;
+ if(Abs(Uav)<tolerance(1) && Abs(Vav)<tolerance(2)) {
+ // modified by NIZHNY-MKK Fri Oct 27 13:02:49 2000.BEGIN
+ // wd1[av].etat=-wd1[av].etat;
+ if(wd1[av].etat < 0) {
+ movementdirectioninfo[av] = 0;
+ } else {
+ wd1[av].etat=-wd1[av].etat;
+ movementdirectioninfo[av] = -StepSign;
+ }
+ // modified by NIZHNY-MKK Fri Oct 27 13:02:52 2000.END
+ //-- cout<<"\n Debug ? lbr ds IntWalk_IWalking_3.gxx"<<endl;
+ CurrentLine->AddStatusFirst(Standard_False, Standard_True, av, Pnts1.Value(av));
+ }
+ }
+ }
}
} //end of point processing
} //end of all points
math_FunctionSetRoot Rsnld(Func,tolerance);
Standard_Integer nbLoop = Pnts2.Length();
-
+
for (I = 1;I<=nbLoop;I++) {
- if (wd2[I].etat > 12) { // start point of closed line
-
+ if (wd2[I].etat > 12)
+ { // start point of closed line
LoopPnt = Pnts2.Value(I);
previousPoint.SetValue(ThePointOfLoopTool::Value3d(LoopPnt),reversed,
- wd2[I].ustart,wd2[I].vstart);
+ wd2[I].ustart,wd2[I].vstart);
previousd3d = ThePointOfLoopTool::Direction3d(LoopPnt);
previousd2d = ThePointOfLoopTool::Direction2d(LoopPnt);
Standard_Real d2dx = Abs(previousd2d.X());
Standard_Real d2dy = Abs(previousd2d.Y());
if (d2dx < tolerance(1)) {
- PasC = pas * (VM-Vm)/d2dy;
+ PasC = pas * (VM-Vm)/d2dy;
}
else if (d2dy < tolerance(2)) {
- PasC = pas * (UM-Um)/d2dx;
+ PasC = pas * (UM-Um)/d2dx;
}
else {
- PasC = pas * Min((UM-Um)/d2dx,(VM-Vm)/d2dy);
+ PasC = pas * Min((UM-Um)/d2dx,(VM-Vm)/d2dy);
}
PasSav = PasC;
ArretAjout = Standard_False;
NbDivision = 0;
StatusPrecedent = IntWalk_OK;
+ Standard_Integer aNbIter = 10;
while (!Arrive) { // as no test of stop is passed
- Cadre=Cadrage(BornInf,BornSup,Uvap,PasC, StepSign); // border?
+ Cadre=Cadrage(BornInf,BornSup,Uvap,PasC, StepSign); // border?
#ifdef CHRONO
- Chronrsnld.Start();
+ Chronrsnld.Start();
#endif
- Rsnld.Perform(Func,Uvap,BornInf,BornSup);
+ Rsnld.Perform(Func,Uvap,BornInf,BornSup);
#ifdef CHRONO
- Chronrsnld.Stop();
+ Chronrsnld.Stop();
#endif
- if (Cadre) { // update of limits.
- BornInf(1) = Um;BornSup(1) = UM;BornInf(2) = Vm;BornSup(2) = VM;
- }
- if (Rsnld.IsDone()) {
- if (Abs(Func.Root()) > Func.Tolerance()) { // no solution for the tolerance
- PasC = PasC/2.;
- PasCu = Abs(PasC*previousd2d.X());
- PasCv = Abs(PasC*previousd2d.Y());
-
- if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
- if (CurrentLine->NbPoints()==1) break;
- Arrive = Standard_True;
- CurrentLine->AddStatusFirstLast(Standard_False,
- Standard_False,Standard_False);
- Rajout = Standard_True;
+ if (Cadre) { // update of limits.
+ BornInf(1) = Um;BornSup(1) = UM;BornInf(2) = Vm;BornSup(2) = VM;
+ }
+ if (Rsnld.IsDone()) {
+ if (Abs(Func.Root()) > Func.Tolerance()) { // no solution for the tolerance
+ PasC = PasC/2.;
+ PasCu = Abs(PasC*previousd2d.X());
+ PasCv = Abs(PasC*previousd2d.Y());
+
+ if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
+ if (CurrentLine->NbPoints()==1) break;
+ Arrive = Standard_True;
+ CurrentLine->AddStatusFirstLast(Standard_False,
+ Standard_False,Standard_False);
+ Rajout = Standard_True;
seqAjout.Append(lines.Length()+1);
- Tgtend = Standard_True;
- }
- }
- else { // there is a solution
- Rsnld.Root(Uvap);
- Arrive = TestArretPassage(Umult,Vmult,Uvap,I,Ipass);
- if (Arrive) {//reset proper parameter to test the arrow.
- Psol = CurrentLine->Value(1);
- if (!reversed) {
- Psol.ParametersOnS2(Uvap(1),Uvap(2));
- }
- else {
- Psol.ParametersOnS1(Uvap(1),Uvap(2));
- }
+ Tgtend = Standard_True;
+ }
+ }
+ else { // there is a solution
+ Rsnld.Root(Uvap);
+ Arrive = TestArretPassage(Umult,Vmult,Uvap,I,Ipass);
+ if (Arrive) {//reset proper parameter to test the arrow.
+ Psol = CurrentLine->Value(1);
+ if (!reversed) {
+ Psol.ParametersOnS2(Uvap(1),Uvap(2));
+ }
+ else {
+ Psol.ParametersOnS1(Uvap(1),Uvap(2));
+ }
Cadre=Standard_False;
- //in case if there is a frame and arrival at the same time
- }
- else { // modif jag 940615
-
- if (Rajout) { // test on added points
- ArretAjout =TestArretAjout(Func,Uvap,N,Psol);
- if (ArretAjout) {
- if (N >0) {
- Tgtend = lines.Value(N)->IsTangentAtEnd();
- N = -N;
- }
- else {
- Tgtend = lines.Value(-N)->IsTangentAtBegining();
- }
- Arrive = (wd2[I].etat == 12);
- }
- }
-
- if (!ArretAjout&& Cadre) { // test on already marked points
- if (CurrentLine->NbPoints() == 1) break; // cancel the line
- TestArretCadre(Umult,Vmult,CurrentLine,Func,Uvap,N);
-// if (N==0) {
- if (N <= 0) { // jag 941017
- MakeWalkingPoint(2,Uvap(1),Uvap(2),Func,Psol);
- Tgtend = Func.IsTangent(); // jag 940616
- N = -N;
- }
- Arrive = (wd2[I].etat == 12); // the line is open
- }
- }
- Status = TestDeflection(Func, Arrive,Uvap,StatusPrecedent,
- NbDivision,PasC,StepSign);
- StatusPrecedent = Status;
- if (Status == IntWalk_PasTropGrand) {// division of the step
- Arrive = Standard_False;
- ArretAjout = Standard_False;
- Tgtend = Standard_False; // jag 940616
- if (!reversed) {
- previousPoint.ParametersOnS2(Uvap(1),Uvap(2));
- }
- else {
- previousPoint.ParametersOnS1(Uvap(1),Uvap(2));
- }
- }
- else if (ArretAjout || Cadre) {
-
- if (Arrive) { // line s is open
- CurrentLine->AddStatusLast(Standard_False);
- if (Status != IntWalk_ArretSurPointPrecedent) {
- CurrentLine->AddPoint(Psol);
- }
- if (Cadre && N==0) {
- Rajout = Standard_True;
- seqAjout.Append(lines.Length()+1);
- }
-
- }
- else { // open
- wd2[I].etat = 12; // declare it open
- Tgtbeg = Tgtend;
- Tgtend = Standard_False;
- ArretAjout = Standard_False;
- StepSign = -1;
+ //in case if there is a frame and arrival at the same time
+ }
+ else { // modif jag 940615
+ if (Rajout) { // test on added points
+ ArretAjout =TestArretAjout(Func,Uvap,N,Psol);
+ if (ArretAjout) {
+ if (N >0) {
+ Tgtend = lines.Value(N)->IsTangentAtEnd();
+ N = -N;
+ }
+ else {
+ Tgtend = lines.Value(-N)->IsTangentAtBegining();
+ }
+ Arrive = (wd2[I].etat == 12);
+ }
+ }
+
+ if (!ArretAjout&& Cadre) { // test on already marked points
+ if (CurrentLine->NbPoints() == 1) break; // cancel the line
+ TestArretCadre(Umult,Vmult,CurrentLine,Func,Uvap,N);
+ // if (N==0) {
+ if (N <= 0) { // jag 941017
+ MakeWalkingPoint(2,Uvap(1),Uvap(2),Func,Psol);
+ Tgtend = Func.IsTangent(); // jag 940616
+ N = -N;
+ }
+ Arrive = (wd2[I].etat == 12); // the line is open
+ }
+ }
+ Status = TestDeflection(Func, Arrive,Uvap,StatusPrecedent,
+ NbDivision,PasC,StepSign);
+
+ StatusPrecedent = Status;
+ if (Status == IntWalk_PasTropGrand) {// division of the step
+ Arrive = Standard_False;
+ ArretAjout = Standard_False;
+ Tgtend = Standard_False; // jag 940616
+ if (!reversed) {
+ previousPoint.ParametersOnS2(Uvap(1),Uvap(2));
+ }
+ else {
+ previousPoint.ParametersOnS1(Uvap(1),Uvap(2));
+ }
+ }
+ else if (ArretAjout || Cadre) {
+
+ if (Arrive) { // line s is open
+ CurrentLine->AddStatusLast(Standard_False);
+ if (Status != IntWalk_ArretSurPointPrecedent) {
+ CurrentLine->AddPoint(Psol);
+ }
+ if (Cadre && N==0) {
+ Rajout = Standard_True;
+ seqAjout.Append(lines.Length()+1);
+ }
+
+ }
+ else { // open
+ wd2[I].etat = 12; // declare it open
+ Tgtbeg = Tgtend;
+ Tgtend = Standard_False;
+ ArretAjout = Standard_False;
+ StepSign = -1;
StatusPrecedent = IntWalk_OK;
- PasC = PasSav;
- if (Status == IntWalk_ArretSurPointPrecedent) {
- OpenLine(0,Psol,Pnts1,Func,CurrentLine);
- }
- else {
- OpenLine(-lines.Length()-1,Psol,Pnts1,Func,CurrentLine);
- }
- if (Cadre && N==0) {
- Rajout = Standard_True;
- seqAjout.Append(-lines.Length()-1);
- }
- }
- }
-
- else if ( Status == IntWalk_ArretSurPointPrecedent) {
- if (CurrentLine->NbPoints() == 1) { //cancel the line
- Arrive = Standard_False;
- break;
- }
- if (wd2[I].etat >12) { //the line should become open
- wd2[I].etat = 12; //declare it open
- ArretAjout = Standard_False;
- OpenLine(0,Psol,Pnts1,Func,CurrentLine);
- StepSign = -1;
+ PasC = PasSav;
+ if (Status == IntWalk_ArretSurPointPrecedent) {
+ OpenLine(0,Psol,Pnts1,Func,CurrentLine);
+ }
+ else {
+ OpenLine(-lines.Length()-1,Psol,Pnts1,Func,CurrentLine);
+ }
+ if (Cadre && N==0) {
+ Rajout = Standard_True;
+ seqAjout.Append(-lines.Length()-1);
+ }
+ }
+ }
+ else if ( Status == IntWalk_ArretSurPointPrecedent) {
+ if (CurrentLine->NbPoints() == 1) { //cancel the line
+ Arrive = Standard_False;
+ break;
+ }
+ if (wd2[I].etat >12) { //the line should become open
+ wd2[I].etat = 12; //declare it open
+ ArretAjout = Standard_False;
+ OpenLine(0,Psol,Pnts1,Func,CurrentLine);
+ StepSign = -1;
StatusPrecedent = IntWalk_OK;
- Arrive = Standard_False;
- PasC = PasSav;
- Rajout = Standard_True;
+ Arrive = Standard_False;
+ PasC = PasSav;
+ Rajout = Standard_True;
seqAjout.Append(-lines.Length()-1);
- }
- else { // line s is open
- Arrive =Standard_True;
- CurrentLine->AddStatusLast(Standard_False);
- Rajout = Standard_True;
+ }
+ else { // line s is open
+ Arrive =Standard_True;
+ CurrentLine->AddStatusLast(Standard_False);
+ Rajout = Standard_True;
seqAjout.Append(lines.Length()+1);
- }
- }
- else if (Arrive) {
- if (wd2[I].etat > 12) { //line closed good case
- CurrentLine->AddStatusFirstLast(Standard_True,
- Standard_False,Standard_False);
- CurrentLine->AddPoint(CurrentLine->Value(1));
- }
- else if (N >0) { //point of stop given at input
- PathPnt = Pnts1.Value(N);
- CurrentLine->AddStatusLast(Standard_True,N,PathPnt);
+ }
+ }
+ else if (Arrive) {
+ if (wd2[I].etat > 12) { //line closed good case
+ CurrentLine->AddStatusFirstLast(Standard_True,
+ Standard_False,Standard_False);
+ CurrentLine->AddPoint(CurrentLine->Value(1));
+ }
+ else if (N >0) { //point of stop given at input
+ PathPnt = Pnts1.Value(N);
+ CurrentLine->AddStatusLast(Standard_True,N,PathPnt);
AddPointInCurrentLine(N,PathPnt,CurrentLine);
- }
- }
- else if (Status == IntWalk_ArretSurPoint) {
- if (wd2[I].etat >12) { //line should become open
- wd2[I].etat = 12; //declare it open
- Tgtbeg = Standard_True;
- Tgtend = Standard_False;
+ }
+ }
+ else if (Status == IntWalk_ArretSurPoint) {
+ if (wd2[I].etat >12) { //line should become open
+ wd2[I].etat = 12; //declare it open
+ Tgtbeg = Standard_True;
+ Tgtend = Standard_False;
N= -lines.Length()-1;
Psol.SetValue(Func.Point(),reversed,Uvap(1),Uvap(2));
- OpenLine(N,Psol,Pnts1,Func,CurrentLine);
- StepSign = -1;
- Rajout = Standard_True;
+ OpenLine(N,Psol,Pnts1,Func,CurrentLine);
+ StepSign = -1;
+ Rajout = Standard_True;
seqAjout.Append(N);
StatusPrecedent = IntWalk_OK;
- Arrive = Standard_False;
- PasC = PasSav;
- }
- else {
- Arrive = Standard_True;
- if (Ipass!=0) { //point of passage, point of stop
- PathPnt = Pnts1.Value(Ipass);
- CurrentLine->AddStatusLast(Standard_True,Ipass,PathPnt);
+ Arrive = Standard_False;
+ PasC = PasSav;
+ }
+ else {
+ Arrive = Standard_True;
+ if (Ipass!=0) { //point of passage, point of stop
+ PathPnt = Pnts1.Value(Ipass);
+ CurrentLine->AddStatusLast(Standard_True,Ipass,PathPnt);
AddPointInCurrentLine(Ipass,PathPnt,CurrentLine);
- }
- else {
+ }
+ else {
CurrentLine->AddStatusLast(Standard_False);
- IntSurf_PntOn2S newP;
- newP.SetValue(Func.Point(),reversed,Uvap(1),Uvap(2));
+ IntSurf_PntOn2S newP;
+ newP.SetValue(Func.Point(),reversed,Uvap(1),Uvap(2));
CurrentLine->AddPoint(newP);
- Rajout = Standard_True;
- seqAjout.Append(lines.Length()+1);
+ Rajout = Standard_True;
+ seqAjout.Append(lines.Length()+1);
}
- }
- }
- else if (Status == IntWalk_OK) {
- if (Ipass!=0) CurrentLine->AddIndexPassing(Ipass);
- previousPoint.SetValue(Func.Point(),reversed,Uvap(1),Uvap(2));
- previousd3d = Func.Direction3d();
- previousd2d = Func.Direction2d();
- CurrentLine->AddPoint(previousPoint);
- }
- }
- }
- else { //no numerical solution NotDone
- PasC = PasC/2.;
- PasCu = Abs(PasC*previousd2d.X());
- PasCv = Abs(PasC*previousd2d.Y());
-
- if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
+ }
+ }
+ else if (Status == IntWalk_OK) {
+ if (Ipass!=0) CurrentLine->AddIndexPassing(Ipass);
+ previousPoint.SetValue(Func.Point(),reversed,Uvap(1),Uvap(2));
+ previousd3d = Func.Direction3d();
+ previousd2d = Func.Direction2d();
+ CurrentLine->AddPoint(previousPoint);
+ }
+ else if (Status == IntWalk_PointConfondu)
+ {
+ aNbIter --;
+ }
+ }
+ }
+ else { //no numerical solution NotDone
+ PasC = PasC/2.;
+ PasCu = Abs(PasC*previousd2d.X());
+ PasCv = Abs(PasC*previousd2d.Y());
+
+ if (PasCu <= tolerance(1) && PasCv <= tolerance(2)) {
if (CurrentLine->NbPoints() == 1) break; // cancel the line
- Arrive = Standard_True;
- CurrentLine->AddStatusFirstLast(Standard_False,Standard_False,
- Standard_False);
- Tgtend = Standard_True;
- Rajout = Standard_True;
- seqAjout.Append(lines.Length()+1);
- }
- }
+ Arrive = Standard_True;
+ CurrentLine->AddStatusFirstLast(Standard_False,Standard_False,
+ Standard_False);
+ Tgtend = Standard_True;
+ Rajout = Standard_True;
+ seqAjout.Append(lines.Length()+1);
+ }
+ }
+
+ if(aNbIter < 0)
+ break;
}// end of started line
if (Arrive) {
- CurrentLine->SetTangencyAtBegining(Tgtbeg);
- CurrentLine->SetTangencyAtEnd(Tgtend);
-
- lines.Append(CurrentLine);
- wd2[I].etat=-wd2[I].etat; //mark point as processed
+ CurrentLine->SetTangencyAtBegining(Tgtbeg);
+ CurrentLine->SetTangencyAtEnd(Tgtend);
+
+ lines.Append(CurrentLine);
+ wd2[I].etat=-wd2[I].etat; //mark point as processed
}
} //end of processing of start point
} //end of all start points
//-- if epsilon is great enough (1e-11). In this case one loops
//-- without ever changing the values sent to Rsnld.
//---------------------------------------------------------------------------------
- Standard_Real Paramu, Paramv, StepU,StepV;
- Standard_Real Cosi, Cosi2, Norme;
+ Standard_Real Paramu = 0.0, Paramv = 0.0;
+
+ if (!reversed) {
+ previousPoint.ParametersOnS2(Paramu, Paramv);
+ }
+ else
+ {
+ previousPoint.ParametersOnS1(Paramu, Paramv);
+ }
+
+ const Standard_Real Du = UV(1) - Paramu;
+ const Standard_Real Dv = UV(2) - Paramv;
+ const Standard_Real Duv = Du * Du + Dv * Dv;
gp_Vec Corde(previousPoint.Value(), sp.Point());
- Norme = Corde.SquareMagnitude();
-// if (Norme <= epsilon*epsilon) {
- if ((++NbPointsConfondusConsecutifs < 10) && (Norme <= epsilon)) { // the square is already taken in the constructor
+ const Standard_Real Norme = Corde.SquareMagnitude(),
+ aTol = epsilon*Precision::PConfusion();
+
+ //if ((++NbPointsConfondusConsecutifs < 10) && (Norme <= epsilon)) { // the square is already taken in the constructor
+ if ((Norme <= epsilon) && ((Duv <= aTol) || (StatusPrecedent != IntWalk_OK)))
+ { // the square is already taken in the constructor
Status = IntWalk_PointConfondu;
if (StatusPrecedent == IntWalk_PasTropGrand) {
return IntWalk_ArretSurPointPrecedent;
}
-
- if(++EpsilonSembleTropGrand > 5 && NbPointsConfondusConsecutifs == 8) { //-- Temporary
- if(epsilon>0.00000000001) epsilon*=0.5; //-- Temporary
- EpsilonSembleTropGrand = 0; //-- Temporary
- }
}
else {
- NbPointsConfondusConsecutifs = 0; //-- Temporary
- EpsilonSembleTropGrand = 0; //-- Temporary
- if(Norme<1e-16) Norme = 1e-16; //-- Temporary
-
- Cosi = Corde * previousd3d;
- if (Cosi*StepSign < 0.) { // angle 3d > pi/2 !!!!
- Cosi2 = 0.;
- }
- else {
- Cosi2 = Cosi * Cosi / previousd3d.SquareMagnitude() / Norme;
+ Standard_Real Cosi = Corde * previousd3d;
+ Standard_Real Cosi2 = 0.0;
+
+ if (Cosi*StepSign >= 0.) {// angle 3d <= pi/2 !!!!
+ const Standard_Real aDiv = previousd3d.SquareMagnitude()*Norme;
+ if(aDiv == 0)
+ return Status;
+ Cosi2 = Cosi * Cosi / aDiv;
}
if (Cosi2 < CosRef3D) { //angle 3d too great
Step = Step /2.0;
- StepU = Abs(Step*previousd2d.X());
- StepV = Abs(Step*previousd2d.Y());
+ Standard_Real StepU = Abs(Step*previousd2d.X()),
+ StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
- Status = IntWalk_ArretSurPointPrecedent;
+ Status = IntWalk_ArretSurPointPrecedent;
else
- Status = IntWalk_PasTropGrand;
+ Status = IntWalk_PasTropGrand;
return Status;
}
}
- if (!reversed) {
- previousPoint.ParametersOnS2(Paramu, Paramv);
- }
- else {
- previousPoint.ParametersOnS1(Paramu, Paramv);
- }
- Standard_Real Du = UV(1) - Paramu;
- Standard_Real Dv = UV(2) - Paramv;
- Standard_Real Duv = Du * Du + Dv * Dv;
if (Abs(Du) < tolerance(1) && Abs(Dv) < tolerance(2))
return IntWalk_ArretSurPointPrecedent; //confused point 2d
- Cosi = StepSign * (Du * previousd2d.X() +
- Dv * previousd2d.Y());
+
+ Standard_Real Cosi = StepSign * (Du * previousd2d.X() + Dv * previousd2d.Y());
+
if (Cosi < 0 && Status == IntWalk_PointConfondu)
return IntWalk_ArretSurPointPrecedent; // leave as step back
// with confused point
-
if (sp.IsTangent())
return IntWalk_ArretSurPoint;
//if during routing one has subdivided more than MaxDivision for each
//previous step, bug on the square; do nothing (experience U4)
- if (NbDivision < MaxDivision &&
- Status != IntWalk_PointConfondu &&
- StatusPrecedent!= IntWalk_PointConfondu ) {
- Cosi2 = Cosi * Cosi / Duv;
+ if ((NbDivision < MaxDivision) && (Status != IntWalk_PointConfondu) &&
+ (StatusPrecedent!= IntWalk_PointConfondu))
+ {
+ Standard_Real Cosi2 = Cosi * Cosi / Duv;
if (Cosi2 < CosRef2D || Cosi < 0 ) {
Step = Step / 2.0;
- StepU = Abs(Step*previousd2d.X());
- StepV = Abs(Step*previousd2d.Y());
+ Standard_Real StepU = Abs(Step*previousd2d.X()),
+ StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
- Status = IntWalk_ArretSurPointPrecedent;
+ Status = IntWalk_ArretSurPointPrecedent;
else
- Status = IntWalk_PasTropGrand;
+ Status = IntWalk_PasTropGrand;
NbDivision = NbDivision + 1;
return Status;
}
Cosi2 = Cosi * Cosi / sp.Direction3d().SquareMagnitude() / Norme;
if (Cosi2 < CosRef3D ){ //angle 3d too great
Step = Step / 2.;
- StepU = Abs(Step*previousd2d.X());
- StepV = Abs(Step*previousd2d.Y());
+ Standard_Real StepU = Abs(Step*previousd2d.X()),
+ StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
- Status = IntWalk_ArretSurPoint;
+ Status = IntWalk_ArretSurPoint;
else
- Status = IntWalk_PasTropGrand;
+ Status = IntWalk_PasTropGrand;
return Status;
}
Cosi = Du * sp.Direction2d().X() +
- Dv * sp.Direction2d().Y();
+ Dv * sp.Direction2d().Y();
Cosi2 = Cosi * Cosi / Duv;
if (Cosi2 < CosRef2D ||
- sp.Direction2d() * previousd2d < 0) {
- //angle 2d too great or change the side
- Step = Step / 2.;
- StepU = Abs(Step*previousd2d.X());
- StepV = Abs(Step*previousd2d.Y());
- if (StepU < tolerance(1) && StepV < tolerance(2))
- Status = IntWalk_ArretSurPointPrecedent;
- else
- Status = IntWalk_PasTropGrand;
- return Status;
+ sp.Direction2d() * previousd2d < 0) {
+ //angle 2d too great or change the side
+ Step = Step / 2.;
+ Standard_Real StepU = Abs(Step*previousd2d.X()),
+ StepV = Abs(Step*previousd2d.Y());
+ if (StepU < tolerance(1) && StepV < tolerance(2))
+ Status = IntWalk_ArretSurPointPrecedent;
+ else
+ Status = IntWalk_PasTropGrand;
+ return Status;
}
}
if (!Finished) {
-
- if (Status == IntWalk_PointConfondu) {
- StepU = Min(Abs(1.5 * Du),pas*(UM-Um));
- StepV = Min(Abs(1.5 * Dv),pas*(VM-Vm));
+ if (Status == IntWalk_PointConfondu)
+ {
+ Standard_Real StepU = Min(Abs(1.5 * Du),pas*(UM-Um)),
+ StepV = Min(Abs(1.5 * Dv),pas*(VM-Vm));
Standard_Real d2dx = Abs(previousd2d.X());
Standard_Real d2dy = Abs(previousd2d.Y());
- if (d2dx < tolerance(1)) {
- Step = StepV/d2dy;
+ if (d2dx < tolerance(1))
+ {
+ Step = StepV/d2dy;
}
- else if (d2dy < tolerance(2)) {
- Step = StepU/d2dx;
+ else if (d2dy < tolerance(2))
+ {
+ Step = StepU/d2dx;
}
- else {
- Step = Min(StepU/d2dx,StepV/d2dy);
+ else
+ {
+ Step = Min(StepU/d2dx,StepV/d2dy);
}
-
-
-
}
- else {
-// estimate the current vector.
-// if vector/2<=current vector<= vector it is considered that the criterion
-// is observed.
-// otherwise adjust the step depending on the previous step
-
-/*
- Standard_Real Dist = Sqrt(Norme)/3.;
- TColgp_Array1OfPnt Poles(1,4);
- gp_Pnt POnCurv,Milieu;
- Poles(1) = previousPoint.Value();
- Poles(4) = sp.Point();
- Poles(2) = Poles(1).XYZ() +
- StepSign * Dist* previousd3d.Normalized().XYZ();
- Poles(3) = Poles(4).XYZ() -
- StepSign * Dist*sp.Direction3d().Normalized().XYZ();
- BzCLib::PntPole(0.5,Poles,POnCurv);
- Milieu = (Poles(1).XYZ() + Poles(4).XYZ())*0.5;
-// FlecheCourante = Milieu.Distance(POnCurv);
- Standard_Real FlecheCourante = Milieu.SquareDistance(POnCurv);
-*/
-
- // Direct calculation :
- // POnCurv=(((p1+p2)/2.+(p2+p3)/2.)/2. + ((p2+p3)/2.+(p3+P4)/2.)/2.)/2.
- // either POnCurv = p1/8. + 3.p2/8. + 3.p3/8. + p4/8.
- // Or p2 = p1 + lambda*d1 et p3 = p4 - lambda*d4
- // So POnCurv = (p1 + p4)/2. + 3.*(lambda d1 - lambda d4)/8.
- // Calculate the deviation with (p1+p4)/2. . So it is just necessary to calculate
- // the norm (square) of 3.*lambda (d1 - d4)/8.
- // either the norm of :
- // 3.*(Sqrt(Norme)/3.)*StepSign*(d1-d4)/8.
- // which produces, takin the square :
- // Norme * (d1-d4).SquareMagnitude()/64.
+ else
+ {
+ // estimate the current vector.
+ // if vector/2<=current vector<= vector it is considered that the criterion
+ // is observed.
+ // otherwise adjust the step depending on the previous step
+
+ /*
+ Standard_Real Dist = Sqrt(Norme)/3.;
+ TColgp_Array1OfPnt Poles(1,4);
+ gp_Pnt POnCurv,Milieu;
+ Poles(1) = previousPoint.Value();
+ Poles(4) = sp.Point();
+ Poles(2) = Poles(1).XYZ() +
+ StepSign * Dist* previousd3d.Normalized().XYZ();
+ Poles(3) = Poles(4).XYZ() -
+ StepSign * Dist*sp.Direction3d().Normalized().XYZ();
+ BzCLib::PntPole(0.5,Poles,POnCurv);
+ Milieu = (Poles(1).XYZ() + Poles(4).XYZ())*0.5;
+ // FlecheCourante = Milieu.Distance(POnCurv);
+ Standard_Real FlecheCourante = Milieu.SquareDistance(POnCurv);
+ */
+
+ // Direct calculation :
+ // POnCurv=(((p1+p2)/2.+(p2+p3)/2.)/2. + ((p2+p3)/2.+(p3+P4)/2.)/2.)/2.
+ // either POnCurv = p1/8. + 3.p2/8. + 3.p3/8. + p4/8.
+ // Or p2 = p1 + lambda*d1 et p3 = p4 - lambda*d4
+ // So POnCurv = (p1 + p4)/2. + 3.*(lambda d1 - lambda d4)/8.
+ // Calculate the deviation with (p1+p4)/2. . So it is just necessary to calculate
+ // the norm (square) of 3.*lambda (d1 - d4)/8.
+ // either the norm of :
+ // 3.*(Sqrt(Norme)/3.)*StepSign*(d1-d4)/8.
+ // which produces, takin the square :
+ // Norme * (d1-d4).SquareMagnitude()/64.
Standard_Real FlecheCourante =
(previousd3d.Normalized().XYZ()-sp.Direction3d().Normalized().XYZ()).SquareModulus()*Norme/64.;
// if (FlecheCourante <= 0.5*fleche) {
- if (FlecheCourante <= 0.25*fleche*fleche) {
-
- Standard_Real d2dx = Abs(sp.Direction2d().X());
- Standard_Real d2dy = Abs(sp.Direction2d().Y());
-
- StepU = Min(Abs(1.5*Du),pas*(UM-Um));
- StepV = Min(Abs(1.5*Dv),pas*(VM-Vm));
-
- if (d2dx < tolerance(1)) {
- Step = StepV/d2dy;
- }
- else if (d2dy < tolerance(2)) {
- Step = StepU/d2dx;
- }
- else {
- Step = Min(StepU/d2dx,StepV/d2dy);
- }
-
+ if (FlecheCourante <= 0.25*fleche*fleche)
+ {
+ Standard_Real d2dx = Abs(sp.Direction2d().X());
+ Standard_Real d2dy = Abs(sp.Direction2d().Y());
+
+ Standard_Real StepU = Min(Abs(1.5*Du),pas*(UM-Um)),
+ StepV = Min(Abs(1.5*Dv),pas*(VM-Vm));
+
+ if (d2dx < tolerance(1))
+ {
+ Step = StepV/d2dy;
+ }
+ else if (d2dy < tolerance(2))
+ {
+ Step = StepU/d2dx;
+ }
+ else
+ {
+ Step = Min(StepU/d2dx,StepV/d2dy);
+ }
}
- else {
-// if (FlecheCourante > fleche) { // step too great
- if (FlecheCourante > fleche*fleche) { // step too great
- Step = Step /2.;
- StepU = Abs(Step*previousd2d.X());
- StepV = Abs(Step*previousd2d.Y());
+ else
+ {
+ //if (FlecheCourante > fleche) { // step too great
+ if (FlecheCourante > fleche*fleche)
+ { // step too great
+ Step = Step /2.;
+ Standard_Real StepU = Abs(Step*previousd2d.X()),
+ StepV = Abs(Step*previousd2d.Y());
+
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
- }
- else {
- Standard_Real d2dx = Abs(sp.Direction2d().X());
- Standard_Real d2dy = Abs(sp.Direction2d().Y());
-
- StepU = Min(Abs(1.5*Du),pas*(UM-Um));
- StepV = Min(Abs(1.5*Dv),pas*(VM-Vm));
-
- if (d2dx < tolerance(1)) {
- Step = Min(Step,StepV/d2dy);
- }
- else if (d2dy < tolerance(2)) {
- Step = Min(Step,StepU/d2dx);
- }
- else {
- Step = Min(Step,Min(StepU/d2dx,StepV/d2dy));
- }
- }
+ }
+ else
+ {
+ Standard_Real d2dx = Abs(sp.Direction2d().X());
+ Standard_Real d2dy = Abs(sp.Direction2d().Y());
+
+ Standard_Real StepU = Min(Abs(1.5*Du),pas*(UM-Um)),
+ StepV = Min(Abs(1.5*Dv),pas*(VM-Vm));
+
+ if (d2dx < tolerance(1))
+ {
+ Step = Min(Step,StepV/d2dy);
+ }
+ else if (d2dy < tolerance(2))
+ {
+ Step = Min(Step,StepU/d2dx);
+ }
+ else
+ {
+ Step = Min(Step,Min(StepU/d2dx,StepV/d2dy));
+ }
+ }
}
}
}
}
else {
Standard_Real t = VM2-Vm2;
- if(t<ThePSurfaceTool::UPeriod(Caro2)) {
+ if(t<ThePSurfaceTool::VPeriod(Caro2)) {
t=0.5*(ThePSurfaceTool::VPeriod(Caro2)-t);
t=(t>KELARG*pasuv[3])? KELARG*pasuv[3] : t;
VM2+=t;
-puts "TODO #22911 ALL: Error : The area of the resulting shape is"
-
restore [locate_data_file CTO908_topo104-o1.brep] wheel
restore [locate_data_file CTO908_topo104-o2.brep] jante
bfuse result wheel jante
-set square 0
+set square 40059.9
-puts "TODO #22911 ALL: Error : The area of the resulting shape is"
-
restore [locate_data_file CTO908_topo106-p.brep] poche
restore [locate_data_file CTO908_topo106-n.brep] nervure
bfuse result poche nervure
-set square 0
+set square 108943
# cts17861
-#puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO #22911 ALL: Error : The area of the resulting shape is"
restore [locate_data_file CTO900_cts17861a.rle] a
restore [locate_data_file cts17861b.rle] b
bfuse result a b
-set square 0
+set square 406803
-puts "TODO #22911 ALL: Error : The area of the resulting shape is"
-
restore [locate_data_file a102] a
restore [locate_data_file b136] b
bop a b
boptuc result
-set square 0
+set square 9741.13
compound s_$i result result
incr i
}
-set length 3961.04
+set length 3854.34
set 2dviewer 0
restore [locate_data_file bug23952_s1.draw] a
restore [locate_data_file bug23952_s2.draw] b
-set NbLines 5
+set NbLines 6
set info [OCC23952intersect $NbLines a b]
if { [regexp "theNbSol: OK" $info] != 1 } {
--- /dev/null
+puts "========="\r
+puts "OCC24612"\r
+puts "========="\r
+puts ""\r
+###########################################################\r
+# Wrong pcurve of the section curve\r
+###########################################################\r
+\r
+set MaxTol 5.0e-7\r
+set NbCurv_OK 1\r
+restore [locate_data_file bug24612_b1.brep] b1\r
+restore [locate_data_file bug24612_b2.brep] b2\r
+\r
+mksurface s1 b1\r
+bounds s1 U1f_exp U1l_exp V1f_exp V1l_exp\r
+\r
+dval U1f_exp\r
+dval U1l_exp\r
+dval V1f_exp\r
+dval V1l_exp\r
+\r
+set log [bopcurves b1 b2 -2d]\r
+\r
+regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log} full Toler NbCurv\r
+\r
+if {${NbCurv} != ${NbCurv_OK}} {\r
+ puts "Error: ${NbCurv_OK} curve(s) expected, but ${NbCurv} found."\r
+}\r
+\r
+if {${Toler} > ${MaxTol}} {\r
+ puts "Error: Tolerance is too big!"\r
+}\r
+\r
+#Theoretically, c2d1_1 must cover V-diapason of surface s1 fully.\r
+\r
+set log [dump c2d1_1]\r
+\r
+regexp {Degree +([-0-9.+eE]+), +([-0-9.+eE]+) Poles, +([-0-9.+eE]+)} ${log} full Degree Poles KnotsPoles\r
+puts "Degree=${Degree}"\r
+puts "Poles=${Poles}"\r
+puts "KnotsPoles=${KnotsPoles}"\r
+puts ""\r
+\r
+set Pole 1\r
+set exp_string " +${Pole} : +(\[-0-9.+eE\]+), +(\[-0-9.+eE\]+)"\r
+regexp ${exp_string} ${log} full U_begin V_begin\r
+\r
+puts "Pole=${Pole}"\r
+puts "U_begin=${U_begin}"\r
+puts "V_begin=${V_begin}"\r
+dset V_begin ${V_begin}\r
+puts ""\r
+\r
+set Pole ${Poles}\r
+set exp_string " +${Pole} : +(\[-0-9.+eE\]+), +(\[-0-9.+eE\]+)"\r
+regexp ${exp_string} ${log} full U_end V_end\r
+\r
+puts "Pole=${Pole}"\r
+puts "U_end=${U_end}"\r
+puts "V_end=${V_end}"\r
+dset V_end ${V_end}\r
+puts ""\r
+\r
+set delta_f [dval V1l_exp-V_begin]\r
+\r
+#ATTENTION!!! V_begin must be strictly equal V1l_exp (without any tolerance)\r
+if {${delta_f} != 0} {\r
+ puts "Error: Bad value. V_begin = [dval V_begin], Vlast = [dval V1l_exp]."\r
+} else {\r
+ puts "OK: Good value. V_begin matches with Vlast of surface."\r
+}\r
+\r
+puts ""\r
+\r
+set delta_l [dval V1f_exp-V_end]\r
+\r
+#ATTENTION!!! V_end must be strictly equal V1f_exp (without any tolerance)\r
+if {${delta_l} != 0} {\r
+ puts "Error: Bad value. V_end = [dval V_end], Vfirst = [dval V1f_exp]."\r
+} else {\r
+ puts "OK: Good value. V_end matches with Vfirst of surface."\r
+}\r
## It is impossible to intersect two surfaces
##################################################
-puts "TODO OCC24472 ALL: Error : Intersection was made WRONGLY"
-
restore [locate_data_file OCC13-1.draw] su1
############### checkshape su1 # is not a topological shape
restore [locate_data_file OCC13-2.draw] su2
set err1 [lindex $che1 [expr [llength $che1] - 2]]
if { $err != "curve" && $err1 != "3d"} {
- break
+ break
} else {
- set nom [expr $nom + 1]
+ set nom [expr $nom + 1]
}
incr j}
if { $nom == 0} {
restore [locate_data_file contour.rle] cont
mkplane cont cont
nexplode cyl F
-
-puts "*"
-#puts "TODO OCC22810 All:Faulty .*"
-puts "TODO OCC22810 ALL:Error : The area of the resulting shape is"
ttranslate cont 0 0 -100
#
puts "Error in featperform"
}
-set square 0
+set square 82351.1
projects / occt-copy.git / commitdiff