OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0028838: Configuration - undefine macros coming from X11 headers in place of collision

Browse Source 
The macros Status, Convex, Opposite, FillSolid (coming from X11 headers)
are now undefined in place of definition of methods with same name in OCCT headers.
The usage of variables with name Status is now avoided.

GL_GLEXT_LEGACY is now defined only if not already defined.

The macros AddPrinter (coming from WinAPI headers) is now undefined
within Message_Messenger class definition having method with the same name.
CurrentDirectory macro is now undefined in OSD_Process.hxx.
This commit is contained in:
kgv
2017-02-03 23:27:02 +04:00
committed by bugmaster
parent e3d02d1f84
commit 9fd2d2c382
103 changed files with 598 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/IntWalk/IntWalk_IWalking_3.gxx
View File

@@ -74,7 +74,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
Handle(IntWalk_TheIWLine) CurrentLine; // line under construction
Standard_Boolean Tgtend;
IntWalk_StatusDeflection Status, StatusPrecedent;
IntWalk_StatusDeflection aStatus, StatusPrecedent;
Standard_Integer NbDivision;
// number of divisions of step for each section
@@ -238,10 +238,10 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
}
}
}
Status = TestDeflection(Func, Arrive, UVap, StatusPrecedent,
aStatus = TestDeflection(Func, Arrive, UVap, StatusPrecedent,
NbDivision,PasC,StepSign);
StatusPrecedent = Status;
if (Status == IntWalk_PasTropGrand) {
StatusPrecedent = aStatus;
if (aStatus == IntWalk_PasTropGrand) {
Arrive = Standard_False;
ArretAjout = Standard_False;
Tgtend = Standard_False; // jag 940615
@@ -255,7 +255,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
else if (ArretAjout || Cadre) {
Arrive = Standard_True;
CurrentLine->AddStatusLast(Standard_False);
//if (Status != IntWalk_ArretSurPointPrecedent)
//if (aStatus != IntWalk_ArretSurPointPrecedent)
CurrentLine->AddPoint(Psol);
//Remove <SaveN> from <seqAlone>
for (Standard_Integer iseq = 1; iseq <= seqAlone.Length(); iseq++)
@@ -270,7 +270,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
seqAjout.Append(lines.Length()+1);
}
}
else if (Status == IntWalk_ArretSurPointPrecedent) {
else if (aStatus == IntWalk_ArretSurPointPrecedent) {
if (CurrentLine->NbPoints() == 1) { //cancel the line
Arrive = Standard_False;
break;
@@ -285,7 +285,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
}
else if (Arrive) {
if (CurrentLine->NbPoints() == 1 && // cancel the line
(N == I || Status == IntWalk_PointConfondu) ) {
(N == I || aStatus == 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
@@ -301,7 +301,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
// 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) {
if (aStatus == IntWalk_ArretSurPoint) {
CurrentLine->AddStatusLast(Standard_False);
Tgtend = Standard_True; // need check
}
@@ -333,7 +333,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
// modified by NIZHNY-MKK Fri Oct 27 12:45:33 2000.END
}
}
else if (Status == IntWalk_ArretSurPoint) {
else if (aStatus == IntWalk_ArretSurPoint) {
Arrive = Standard_True;
CurrentLine->AddStatusLast(Standard_False);
Tgtend = Standard_True;
@@ -343,13 +343,13 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
seqAlone.Append(lines.Length() + 1);
seqAjout.Append(lines.Length() + 1);
}
else if (Status == IntWalk_OK) {
else if (aStatus == IntWalk_OK) {
MakeWalkingPoint(2, UVap(1), UVap(2), Func, previousPoint);
previousd3d = Func.Direction3d();
previousd2d = Func.Direction2d();
CurrentLine->AddPoint(previousPoint);
}
else if (Status == IntWalk_PointConfondu)
else if (aStatus == IntWalk_PointConfondu)
{
aNbIter --;
}

22
src/IntWalk/IntWalk_IWalking_4.gxx
View File

@@ -61,7 +61,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
Standard_Integer StepSign;
IntWalk_StatusDeflection Status = IntWalk_OK, StatusPrecedent;
IntWalk_StatusDeflection aStatus = IntWalk_OK, StatusPrecedent;
Standard_Integer NbDivision ; // number of divisions of step
// during calculation of 1 section
@@ -245,7 +245,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
Standard_Real aScaleCoeff = 0.0;
// Avoid finite cycle which lead to stop computing iline.
if (Status != IntWalk_PasTropGrand)
if (aStatus != IntWalk_PasTropGrand)
{
// Make linear extrapolation.
if ( Abs(uv[aCoordIdx - 1] - uvprev[aCoordIdx - 1]) > gp::Resolution())
@@ -303,11 +303,11 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
Arrive = (wd2[I].etat == 12); // the line is open
}
}
Status = TestDeflection(Func, Arrive,Uvap,StatusPrecedent,
aStatus = TestDeflection(Func, Arrive,Uvap,StatusPrecedent,
NbDivision,PasC,StepSign);
StatusPrecedent = Status;
if (Status == IntWalk_PasTropGrand) {// division of the step
StatusPrecedent = aStatus;
if (aStatus == IntWalk_PasTropGrand) {// division of the step
Arrive = Standard_False;
ArretAjout = Standard_False;
Tgtend = Standard_False; // jag 940616
@@ -322,7 +322,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
if (Arrive) { // line s is open
CurrentLine->AddStatusLast(Standard_False);
//if (Status != IntWalk_ArretSurPointPrecedent)
//if (aStatus != IntWalk_ArretSurPointPrecedent)
CurrentLine->AddPoint(Psol);
//Remove <SaveN> from <seqAlone> and, if it is first found point,
@@ -370,7 +370,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
StepSign = -1;
StatusPrecedent = IntWalk_OK;
PasC = PasSav;
if (Status == IntWalk_ArretSurPointPrecedent) {
if (aStatus == IntWalk_ArretSurPointPrecedent) {
CurrentLine->AddPoint(Psol);
OpenLine(0,Psol,Pnts1,Func,CurrentLine);
}
@@ -407,7 +407,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
}
}
}
else if ( Status == IntWalk_ArretSurPointPrecedent) {
else if (aStatus == IntWalk_ArretSurPointPrecedent) {
if (CurrentLine->NbPoints() == 1) { //cancel the line
Arrive = Standard_False;
RemoveTwoEndPoints(I);
@@ -445,7 +445,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
AddPointInCurrentLine(N,PathPnt,CurrentLine);
}
}
else if (Status == IntWalk_ArretSurPoint) {
else if (aStatus == IntWalk_ArretSurPoint) {
if (wd2[I].etat >12) { //line should become open
wd2[I].etat = 12; //declare it open
Tgtbeg = Standard_True;
@@ -479,14 +479,14 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
}
}
}
else if (Status == IntWalk_OK) {
else if (aStatus == 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)
else if (aStatus == IntWalk_PointConfondu)
{
aNbIter --;
}

46
src/IntWalk/IntWalk_IWalking_5.gxx
View File

@@ -51,7 +51,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
//11) calculate the step of advancement depending on the vector
//12) adjust the step depending on the previous steps
IntWalk_StatusDeflection Status = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK;
//---------------------------------------------------------------------------------
//-- lbr le 4 Avril 95 : it is possible that the status returns points confused
@@ -80,7 +80,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
//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;
aStatus = IntWalk_PointConfondu;
if (StatusPrecedent == IntWalk_PasTropGrand) {
return IntWalk_ArretSurPointPrecedent;
}
@@ -92,7 +92,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
if (Cosi*StepSign >= 0.) {// angle 3d <= pi/2 !!!!
const Standard_Real aDiv = previousd3d.SquareMagnitude()*Norme;
if(aDiv == 0)
return Status;
return aStatus;
Cosi2 = Cosi * Cosi / aDiv;
}
if (Cosi2 < CosRef3D) { //angle 3d too great
@@ -100,10 +100,10 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real StepU = Abs(Step*previousd2d.X()),
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
return Status;
aStatus = IntWalk_PasTropGrand;
return aStatus;
}
}
@@ -128,7 +128,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real Cosi = StepSign * (Du * previousd2d.X() + Dv * previousd2d.Y());
if (Cosi < 0 && Status == IntWalk_PointConfondu)
if (Cosi < 0 && aStatus == IntWalk_PointConfondu)
return IntWalk_ArretSurPointPrecedent; // leave as step back
// with confused point
@@ -138,7 +138,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
//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) &&
if ((NbDivision < MaxDivision) && (aStatus != IntWalk_PointConfondu) &&
(StatusPrecedent!= IntWalk_PointConfondu))
{
Standard_Real Cosi2 = Cosi * Cosi / Duv;
@@ -148,11 +148,11 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
aStatus = IntWalk_PasTropGrand;
NbDivision = NbDivision + 1;
return Status;
return aStatus;
}
Cosi = Corde * sp.Direction3d();
@@ -162,10 +162,10 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real StepU = Abs(Step*previousd2d.X()),
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPoint;
aStatus = IntWalk_ArretSurPoint;
else
Status = IntWalk_PasTropGrand;
return Status;
aStatus = IntWalk_PasTropGrand;
return aStatus;
}
Cosi = Du * sp.Direction2d().X() +
Dv * sp.Direction2d().Y();
@@ -177,15 +177,15 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real StepU = Abs(Step*previousd2d.X()),
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
return Status;
aStatus = IntWalk_PasTropGrand;
return aStatus;
}
}
if (!Finished) {
if (Status == IntWalk_PointConfondu)
if (aStatus == IntWalk_PointConfondu)
{
Standard_Real StepU = Min(Abs(1.5 * Du),pas*(UM-Um)),
StepV = Min(Abs(1.5 * Dv),pas*(VM-Vm));
@@ -277,9 +277,9 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
aStatus = IntWalk_PasTropGrand;
}
else
{
@@ -305,9 +305,5 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
}
}
}
return Status;
return aStatus;
}

62
src/IntWalk/IntWalk_PWalking.cxx
View File

@@ -721,7 +721,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
AddAPoint(line,previousPoint);
//
IntWalk_StatusDeflection Status = IntWalk_OK, aPrevStatus = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK, aPrevStatus = IntWalk_OK;
Standard_Boolean NoTestDeflection = Standard_False;
Standard_Real SvParam[4], f;
Standard_Integer LevelOfEmptyInmyIntersectionOn2S=0;
@@ -736,7 +736,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
Arrive = Standard_False;
while(!Arrive) //010
{
aPrevStatus = Status;
aPrevStatus = aStatus;
LevelOfIterWithoutAppend++;
if(LevelOfIterWithoutAppend>20)
@@ -856,7 +856,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
anAbsParamDist[1] < ResoV1 &&
anAbsParamDist[2] < ResoU2 &&
anAbsParamDist[3] < ResoV2 &&
Status != IntWalk_PasTropGrand)
aStatus != IntWalk_PasTropGrand)
{
isBadPoint = Standard_True;
aBestIso = IntImp_ConstIsoparametric((aBestIso + 1) % 4);
@@ -930,7 +930,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
LevelOfEmptyInmyIntersectionOn2S=0;
if(LevelOfIterWithoutAppend < 10)
{
Status = TestDeflection(ChoixIso);
aStatus = TestDeflection(ChoixIso);
}
else
{
@@ -947,11 +947,11 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
//============================================================
if(LevelOfPointConfondu > 5)
{
Status = IntWalk_ArretSurPoint;
aStatus = IntWalk_ArretSurPoint;
LevelOfPointConfondu = 0;
}
//
if(Status==IntWalk_OK)
if(aStatus==IntWalk_OK)
{
NbPasOKConseq++;
if(NbPasOKConseq >= 5)
@@ -1026,12 +1026,12 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
}
while(pastroppetit);
}
}//Status==IntWalk_OK
}//aStatus==IntWalk_OK
else
NbPasOKConseq=0;
//
switch(Status)//007
switch(aStatus)//007
{
case IntWalk_ArretSurPointPrecedent:
{
@@ -1150,7 +1150,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
// JMB 30th December 1999.
// Some statement below should not be put in comment because they are useful.
// See grid CTO 909 A1 which infinitely loops
if(Arrive==Standard_False && Status==IntWalk_ArretSurPoint)
if(Arrive==Standard_False && aStatus==IntWalk_ArretSurPoint)
{
Arrive=Standard_True;
#ifdef OCCT_DEBUG
@@ -1238,7 +1238,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
}//pointisvalid
//====================================================
if(Status == IntWalk_ArretSurPoint)
if (aStatus == IntWalk_ArretSurPoint)
{
RepartirOuDiviser(DejaReparti,ChoixIso,Arrive);
}
@@ -1608,7 +1608,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
}//$$$ end framing on border (!close)
}//004 fin TestArret return Arrive = True
} // 006case IntWalk_ArretSurPoint: end Processing Status = OK or ArretSurPoint
} //007 switch(Status)
} //007 switch(aStatus)
} //008 end processing point (TEST DEFLECTION)
} //009 end processing line (else if myIntersectionOn2S.IsDone())
} //010 end if first departure point allows marching while (!Arrive)
@@ -1628,7 +1628,7 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
Standard_Boolean bStop = !myIntersectionOn2S.IsTangent();
Standard_Integer dIncKey = 1;
TColStd_Array1OfReal Param(1,4);
IntWalk_StatusDeflection Status = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK;
Standard_Integer nbIterWithoutAppend = 0;
Standard_Integer nbEqualPoints = 0;
Standard_Integer parit = 0;
@@ -1690,9 +1690,9 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
return bOutOfTangentZone;
}
Status = TestDeflection(ChoixIso);
aStatus = TestDeflection(ChoixIso);
if(Status == IntWalk_OK) {
if(aStatus == IntWalk_OK) {
for(uvit = 0; uvit < 4; uvit++) {
if(pasuv[uvit] < pasInit[uvit]) {
@@ -1701,7 +1701,7 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
}
}
switch(Status) {
switch(aStatus) {
case IntWalk_ArretSurPointPrecedent:
{
bStop = Standard_True;
@@ -1907,8 +1907,8 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
}
if(!bExtendLine) {
// if(Status == IntWalk_OK || Status == IntWalk_ArretSurPoint) {
if(Status == IntWalk_OK) {
// if(aStatus == IntWalk_OK || aStatus == IntWalk_ArretSurPoint) {
if(aStatus == IntWalk_OK) {
bExtendLine = Standard_True;
if(aSeqOfNewPoint.Length() > 1) {
@@ -2905,7 +2905,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=STATIC_PRECEDENT_INFLEXION=0;
}
IntWalk_StatusDeflection Status = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK;
Standard_Real FlecheCourante , Ratio = 1.0;
// Caro1 and Caro2
@@ -3020,7 +3020,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
pasuv[choixIso] = pasInit[choixIso] = 2*LocalResol;
}
////////////////////////////////////////
Status = IntWalk_PointConfondu;
aStatus = IntWalk_PointConfondu;
}
//==================================================================================
@@ -3097,7 +3097,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
//== N o t T o o G r e a t (angle in space UV) ==
//== C h a n g e o f s i d e ==
//==================================================================================
if (Status != IntWalk_PointConfondu) {
if (aStatus != IntWalk_PointConfondu) {
if(Cosi1*Cosi1 < CosRef1*Duv1 || Cosi2*Cosi2 < CosRef2*Duv2) {
pasuv[0]*=0.5; pasuv[1]*=0.5; pasuv[2]*=0.5; pasuv[3]*=0.5;
if (pasuv[0]<ResoU1 && pasuv[1]<ResoV1 && pasuv[2]<ResoU2 && pasuv[3]<ResoV2) {
@@ -3183,11 +3183,11 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
return IntWalk_PasTropGrand;
}
}
if(Status == IntWalk_OK) {
if(aStatus == IntWalk_OK) {
STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=0;
//-- Try to increase the step
}
return Status;
return aStatus;
}
else { //-- CurrentVector > vector*0.5
if (FlecheCourante > fleche) { //-- Current step too Great
@@ -3206,7 +3206,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
}
}
if(Status != IntWalk_PointConfondu)
if(aStatus != IntWalk_PointConfondu)
{
//Here, aCosBetweenTangent >= 0.0 definitely.
@@ -3273,7 +3273,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
if(aSinB2Max >= 0.0 && (aCosBetweenTangent <= 2.0 * aSinB2Max * aSinB2Max - 1.0))
{//Real deflection is greater or equal than tolconf
Status = IntWalk_PasTropGrand;
aStatus = IntWalk_PasTropGrand;
}
else
{//Real deflection is less than tolconf
@@ -3282,17 +3282,17 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
if((aSinB2Min < 0.0) || (aCosBetweenTangent >= 2.0 * aSinB2Min * aSinB2Min - 1.0))
{//Real deflection is less than tolconf/2.0
Status = IntWalk_StepTooSmall;
aStatus = IntWalk_StepTooSmall;
}
}
if(Status == IntWalk_PasTropGrand)
if(aStatus == IntWalk_PasTropGrand)
{
pasuv[0]*=0.5; pasuv[1]*=0.5; pasuv[2]*=0.5; pasuv[3]*=0.5;
return Status;
return aStatus;
}
if(Status == IntWalk_StepTooSmall)
if(aStatus == IntWalk_StepTooSmall)
{
pasuv[0] = Max(pasuv[0], AbsDu1);
pasuv[1] = Max(pasuv[1], AbsDv1);
@@ -3304,7 +3304,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
pasInit[2] = Max(pasInit[2], AbsDu2);
pasInit[3] = Max(pasInit[3], AbsDv2);
return Status;
return aStatus;
}
}
@@ -3313,8 +3313,8 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
pasuv[2] = Max(myStepMin[2],Min(Min(Ratio*AbsDu2,pasuv[2]),pasInit[2]));
pasuv[3] = Max(myStepMin[3],Min(Min(Ratio*AbsDv2,pasuv[3]),pasInit[3]));
if(Status == IntWalk_OK) STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=0;
return Status;
if(aStatus == IntWalk_OK) STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=0;
return aStatus;
}
Standard_Boolean IntWalk_PWalking::