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

Modifications corresponding to CR26296

Browse Source
This commit is contained in:
jgv
2015-05-30 23:21:03 +03:00
parent e0bcefe2bd
commit 4fbfa92633
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bisector/Bisector_BisecAna.cdl
View File

@@ -127,6 +127,7 @@ is
Bis : Bisec from GccInt ; Bis : Bisec from GccInt ;
V1 : Vec2d from gp ; V1 : Vec2d from gp ;
V2 : Vec2d from gp ; V2 : Vec2d from gp ;
AreVectorsNotTangents : Boolean from Standard;
Sense : Real from Standard ; Sense : Real from Standard ;
U : out Real from Standard ; U : out Real from Standard ;
sense : out Boolean from Standard ; sense : out Boolean from Standard ;

38
src/Bisector/Bisector_BisecAna.cxx
View File

@@ -78,6 +78,7 @@ Standard_Real Bisector_BisecAna::Distance (
const Handle(GccInt_Bisec)& abisector, const Handle(GccInt_Bisec)& abisector,
const gp_Vec2d& afirstvector , const gp_Vec2d& afirstvector ,
const gp_Vec2d& asecondvector, const gp_Vec2d& asecondvector,
const Standard_Boolean AreVectorsNotTangents,
const Standard_Real adirection, const Standard_Real adirection,
Standard_Real& aparameter, Standard_Real& aparameter,
Standard_Boolean& asense, Standard_Boolean& asense,
@@ -184,6 +185,13 @@ Standard_Real Bisector_BisecAna::Distance (
// Modified by Sergey KHROMOV - Thu Oct 31 14:16:54 2002 // Modified by Sergey KHROMOV - Thu Oct 31 14:16:54 2002
} }
} }
//jgv: for OCC26185
if (AreVectorsNotTangents &&
afirstdir * aseconddir > 0. &&
afirstdir * tangdir < 0. &&
aseconddir * tangdir < 0.)
asense = Standard_False;
///////////////////
// Modified by Sergey KHROMOV - Tue Oct 22 16:35:51 2002 End // Modified by Sergey KHROMOV - Tue Oct 22 16:35:51 2002 End
} }
} }
@@ -339,11 +347,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
// adirection,parameter,sense,ok); // adirection,parameter,sense,ok);
if (oncurve) if (oncurve)
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
tan2,tan1, tan2,tan1,Standard_False,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
else else
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
// Modified by skv - Tue Feb 15 17:51:29 2005 Integration End // Modified by skv - Tue Feb 15 17:51:29 2005 Integration End
Handle(Geom2d_Curve) bisectorcurve = new Geom2d_Line(line); Handle(Geom2d_Curve) bisectorcurve = new Geom2d_Line(line);
@@ -412,7 +420,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
sense = Standard_True; sense = Standard_True;
if (oncurve) { if (oncurve) {
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
tan1,tan2, tan1,tan2,Standard_False,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
} }
else {ok = Standard_True;} else {ok = Standard_True;}
@@ -426,11 +434,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
// adirection,parameter,sense,ok); // adirection,parameter,sense,ok);
if (oncurve) if (oncurve)
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
tan2,tan1, tan2,tan1,Standard_False,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
else else
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
// Modified by skv - Tue Feb 15 17:51:29 2005 Integration End // Modified by skv - Tue Feb 15 17:51:29 2005 Integration End
if (distanceptsol <= distancemini) { if (distanceptsol <= distancemini) {
@@ -568,7 +576,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
Handle(GccInt_Bisec) solution = Bisector.ThisSolution(i); Handle(GccInt_Bisec) solution = Bisector.ThisSolution(i);
Degenerate(solution,tolerance); Degenerate(solution,tolerance);
sense = Standard_True; sense = Standard_True;
distanceptsol = Distance(apoint,solution,tan1,tan2, distanceptsol = Distance(apoint,solution,tan1,tan2,Standard_False,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
theSense = sense; theSense = sense;
if (ok || !oncurve) { if (ok || !oncurve) {
@@ -579,11 +587,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
// adirection,parameter,sense,ok); // adirection,parameter,sense,ok);
if (oncurve) if (oncurve)
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
tan2,tan1, tan2,tan1,Stasndard_False,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
else else
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
// Modified by skv - Tue Feb 15 17:51:29 2005 Integration End // Modified by skv - Tue Feb 15 17:51:29 2005 Integration End
if (distanceptsol <= distancemini) { if (distanceptsol <= distancemini) {
@@ -699,11 +707,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
// adirection,parameter,sense,ok); // adirection,parameter,sense,ok);
if (oncurve) if (oncurve)
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
tan2,tan1, tan2,tan1,Standard_False,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
else else
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
// Modified by skv - Tue Feb 15 17:51:29 2005 Integration End // Modified by skv - Tue Feb 15 17:51:29 2005 Integration End
// if (distanceptsol <= distancemini) { // if (distanceptsol <= distancemini) {
@@ -733,11 +741,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
// adirection,parameter,sense,ok); // adirection,parameter,sense,ok);
if (oncurve) if (oncurve)
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
tan2,tan1, tan2,tan1,Standard_False,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
else else
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok, Standard_True); adirection,parameter,sense,ok, Standard_True);
// Modified by skv - Tue Feb 15 17:51:29 2005 Integration End // Modified by skv - Tue Feb 15 17:51:29 2005 Integration End
if (ok || !oncurve) { if (ok || !oncurve) {
@@ -841,7 +849,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
Degenerate(solution,tolerance); Degenerate(solution,tolerance);
sense = Standard_False; sense = Standard_False;
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
if (distanceptsol <= distancemini) { if (distanceptsol <= distancemini) {
@@ -958,7 +966,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
} }
sense = Standard_False; sense = Standard_False;
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
if (ok || !oncurve) { if (ok || !oncurve) {
@@ -1052,7 +1060,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Point)& afirstpoint ,
sense = Standard_False; sense = Standard_False;
distanceptsol = Distance(apoint,solution, distanceptsol = Distance(apoint,solution,
afirstvector,asecondvector, afirstvector,asecondvector,Standard_True,
adirection,parameter,sense,ok); adirection,parameter,sense,ok);
if (ok || !oncurve) { if (ok || !oncurve) {
Handle(Geom2d_Curve) bisectorcurve = new Geom2d_Line(line); Handle(Geom2d_Curve) bisectorcurve = new Geom2d_Line(line);