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

0028764: [Regression to 7.0] Intersection of faces gives exception in debug mode

Browse Source 
Some point were incorrectly removed from the Walking-line.

In the current fix, new method IntWalk_PWalking::RemoveAPoint(...) has been added and implemented in order to provide safe removing.

So, now methods AddAPoint(...) and RemoveAPoint(...) are recommended to use for work with the Walking-line.
This commit is contained in:
nbv 2017-09-22 14:05:01 +03:00 committed by kgv
parent b5cce1ab23
commit 6fd0eb0c1e
4 changed files with 76 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/IntWalk/IntWalk_PWalking.cxx
View File

@ -729,7 +729,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
previousd = myIntersectionOn2S.Direction(); previousd = myIntersectionOn2S.Direction();
previousd1 = myIntersectionOn2S.DirectionOnS1(); previousd1 = myIntersectionOn2S.DirectionOnS1();
previousd2 = myIntersectionOn2S.DirectionOnS2(); previousd2 = myIntersectionOn2S.DirectionOnS2();
indextg = 1; myTangentIdx = 1;
tgdir = previousd; tgdir = previousd;
firstd1 = previousd1; firstd1 = previousd1;
firstd2 = previousd2; firstd2 = previousd2;
@ -748,7 +748,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
if(IsTangentExtCheck(Caro1, Caro2, Param(1), Param(2), Param(3), Param(4), myTolTang, pasuv)) if(IsTangentExtCheck(Caro1, Caro2, Param(1), Param(2), Param(3), Param(4), myTolTang, pasuv))
return; return;
AddAPoint(line,previousPoint); AddAPoint(previousPoint);
// //
IntWalk_StatusDeflection aStatus = IntWalk_OK, aPrevStatus = IntWalk_OK; IntWalk_StatusDeflection aStatus = IntWalk_OK, aPrevStatus = IntWalk_OK;
Standard_Boolean NoTestDeflection = Standard_False; Standard_Boolean NoTestDeflection = Standard_False;
@ -1251,7 +1251,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
} }
} }
// //
AddAPoint(line,previousPoint); AddAPoint(previousPoint);
RejectIndex++; RejectIndex++;
if(RejectIndex >= RejectIndexMAX) if(RejectIndex >= RejectIndexMAX)
@ -1287,7 +1287,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
if(close) if(close)
{ {
//================= la ligne est fermee =============== //================= la ligne est fermee ===============
AddAPoint(line,line->Value(1)); //ligne fermee AddAPoint(line->Value(1)); //ligne fermee
LevelOfIterWithoutAppend=0; LevelOfIterWithoutAppend=0;
} }
else //$$$ else //$$$
@ -1339,7 +1339,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
} }
} }
// //
AddAPoint(line,previousPoint); AddAPoint(previousPoint);
RejectIndex++; RejectIndex++;
if(RejectIndex >= RejectIndexMAX) if(RejectIndex >= RejectIndexMAX)
@ -1573,7 +1573,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
}//if (previoustg) cond. }//if (previoustg) cond.
//////////////////////////////////////// ////////////////////////////////////////
AddAPoint(line,previousPoint); AddAPoint(previousPoint);
RejectIndex++; RejectIndex++;
if(RejectIndex >= RejectIndexMAX) if(RejectIndex >= RejectIndexMAX)
@ -2031,7 +2031,7 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
Standard_Integer i = 0; Standard_Integer i = 0;
for(i = 1; i <= aSeqOfNewPoint.Length(); i++) { for(i = 1; i <= aSeqOfNewPoint.Length(); i++) {
AddAPoint(line, aSeqOfNewPoint.Value(i)); AddAPoint(aSeqOfNewPoint.Value(i));
} }
return bOutOfTangentZone; return bOutOfTangentZone;
@ -2440,7 +2440,7 @@ Standard_Boolean IntWalk_PWalking::
break; break;
} }
line->RemovePoint(1); RemoveAPoint(1);
} }
line->InsertBefore(1, anIP); line->InsertBefore(1, anIP);
@ -2481,7 +2481,7 @@ Standard_Boolean IntWalk_PWalking::
break; break;
} }
line->RemovePoint(aNbPnts); RemoveAPoint(aNbPnts);
} }
line->Add(anIP); line->Add(anIP);
@ -2839,14 +2839,14 @@ RepartirOuDiviser(Standard_Boolean& DejaReparti,
// Standard_Integer i; // Standard_Integer i;
if (Arrive) { //restart in the other direction if (Arrive) { //restart in the other direction
if (!DejaReparti ) { if (!DejaReparti ) {
Arrive = Standard_False; Arrive = Standard_False;
DejaReparti = Standard_True; DejaReparti = Standard_True;
previousPoint = line->Value(1); previousPoint = line->Value(1);
previoustg = Standard_False; previoustg = Standard_False;
previousd1 = firstd1; previousd1 = firstd1;
previousd2 = firstd2; previousd2 = firstd2;
previousd = tgdir; previousd = tgdir;
indextg = line->NbPoints(); myTangentIdx = line->NbPoints();
tgdir.Reverse(); tgdir.Reverse();
line->Reverse(); line->Reverse();
@ -2886,14 +2886,15 @@ RepartirOuDiviser(Standard_Boolean& DejaReparti,
tglast = Standard_True; // IS IT ENOUGH ???? tglast = Standard_True; // IS IT ENOUGH ????
} }
if (!DejaReparti) { //restart in the other direction if (!DejaReparti)
DejaReparti = Standard_True; { //restart in the other direction
previousPoint = line->Value(1); DejaReparti = Standard_True;
previoustg = Standard_False; previousPoint = line->Value(1);
previousd1 = firstd1; previoustg = Standard_False;
previousd2 = firstd2; previousd1 = firstd1;
previousd = tgdir; previousd2 = firstd2;
indextg = line->NbPoints(); previousd = tgdir;
myTangentIdx = line->NbPoints();
tgdir.Reverse(); tgdir.Reverse();
line->Reverse(); line->Reverse();

24
src/IntWalk/IntWalk_PWalking.hxx
View File

@ -132,7 +132,27 @@ public:
Standard_EXPORT void RepartirOuDiviser (Standard_Boolean& DejaReparti, IntImp_ConstIsoparametric& ChoixIso, Standard_Boolean& Arrive); Standard_EXPORT void RepartirOuDiviser (Standard_Boolean& DejaReparti, IntImp_ConstIsoparametric& ChoixIso, Standard_Boolean& Arrive);
void AddAPoint (Handle(IntSurf_LineOn2S)& line, const IntSurf_PntOn2S& POn2S); //! Inserts thePOn2S in the end of line
void AddAPoint (const IntSurf_PntOn2S& thePOn2S);
//! Removes point with index theIndex from line.
//! If theIndex is greater than the number of points in line
//! then the last point will be removed.
//! theIndex must be started with 1.
void RemoveAPoint(const Standard_Integer theIndex)
{
const Standard_Integer anIdx = Min(theIndex, line->NbPoints());
if (anIdx < 1)
return;
if (anIdx <= myTangentIdx)
{
myTangentIdx--;
}
line->RemovePoint(anIdx);
}
Standard_EXPORT Standard_Boolean PutToBoundary (const Handle(Adaptor3d_HSurface)& theASurf1, const Handle(Adaptor3d_HSurface)& theASurf2); Standard_EXPORT Standard_Boolean PutToBoundary (const Handle(Adaptor3d_HSurface)& theASurf1, const Handle(Adaptor3d_HSurface)& theASurf2);
@ -208,7 +228,7 @@ private:
Standard_Boolean close; Standard_Boolean close;
Standard_Boolean tgfirst; Standard_Boolean tgfirst;
Standard_Boolean tglast; Standard_Boolean tglast;
Standard_Integer indextg; Standard_Integer myTangentIdx;
gp_Dir tgdir; gp_Dir tgdir;
Standard_Real fleche; Standard_Real fleche;
Standard_Real pasMax; Standard_Real pasMax;

11
src/IntWalk/IntWalk_PWalking.lxx
View File

@ -54,18 +54,16 @@ inline Standard_Boolean IntWalk_PWalking::IsClosed() const{
return close; return close;
} }
inline const gp_Dir& IntWalk_PWalking::TangentAtLine inline const gp_Dir& IntWalk_PWalking::TangentAtLine(Standard_Integer& theIndex) const
(Standard_Integer& Index) const
{ {
if(!done) throw StdFail_NotDone(); if(!done) throw StdFail_NotDone();
Index = indextg; theIndex = myTangentIdx;
return tgdir; return tgdir;
} }
#define REGLAGE 0 #define REGLAGE 0
inline void IntWalk_PWalking::AddAPoint(Handle(IntSurf_LineOn2S)& theLine, inline void IntWalk_PWalking::AddAPoint(const IntSurf_PntOn2S& POn2S) {
const IntSurf_PntOn2S& POn2S) {
#if REGLAGE #if REGLAGE
Standard_Integer n=theLine->NbPoints(); Standard_Integer n=theLine->NbPoints();
if(n) { if(n) {
@ -79,7 +77,8 @@ inline void IntWalk_PWalking::AddAPoint(Handle(IntSurf_LineOn2S)& theLine,
fflush(stdout); fflush(stdout);
} }
#endif #endif
theLine->Add(POn2S); line->Add(POn2S);
myTangentIdx = Max(myTangentIdx, 1);
} }

24
tests/bugs/modalg_7/bug28764 Normal file
View File

@ -0,0 +1,24 @@
puts "========"
puts "OCC28764"
puts "========"
puts ""
#################################################
# [Regression to 7.0] Intersection of faces gives exception in debug mode
#################################################
restore [locate_data_file bug28764_ff.brep] f
explode f
####
axo
don f
fit
# Before the fix: Exception in Debug-mode only
set log [bopcurves f_1 f_2 -2d]
checkview -screenshot -2d -path ${imagedir}/${test_image}.png
regexp {Tolerance Reached=+([-0-9.+eE]+)} ${log} full Toler
checkreal TolReached $Toler 4.60347250530349e-008 0.0 0.1