OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0024648: Different types of intersection curves between Cone and Torus with a different order of arguments

Browse Source 
Correct treatment of the cases with Cone and Torus.
Test cases for issue CR24648
This commit is contained in:
emv 2014-02-20 17:14:04 +04:00 committed by apn
parent 6f31882ada
commit 1d18c75e70
4 changed files with 345 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
View File

@ -691,6 +691,10 @@ void BOPAlgo_PaveFiller::ForceInterfVE(const Standard_Integer nV,
aT=aProjector.LowerDistanceParameter();
//
BOPDS_VectorOfInterfVE& aVEs=myDS->InterfVE();
if (aVEs.Extent() == 0) {
aVEs.Init();
}
//
i=aVEs.Append()-1;
BOPDS_InterfVE& aVE=aVEs(i);
aVE.SetIndices(nV, nE);

4
src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx
View File

@ -537,6 +537,10 @@ Standard_Boolean BOPAlgo_PaveFiller::ForceInterfVF(const Standard_Integer nV,
BRep_Builder aBB;
//
BOPDS_VectorOfInterfVF& aVFs=myDS->InterfVF();
if (aVFs.Extent() == 0) {
aVFs.Init();
}
//
i=aVFs.Append()-1;
BOPDS_InterfVF& aVF=aVFs(i);
aVF.SetIndices(nV, nF);

113
src/IntPatch/IntPatch_Intersection.cxx
View File

@ -732,7 +732,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
//treatment of the cases with cone or torus
Standard_Boolean TreatAsBiParametric = Standard_False;
Standard_Integer bImp = 0;
Standard_Integer bGeomGeom = 0;
//
if (typs1 == GeomAbs_Cone || typs2 == GeomAbs_Cone ||
typs1 == GeomAbs_Torus || typs2 == GeomAbs_Torus) {
@ -748,36 +748,47 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
aCTType = aCTSurf->GetType();
bToCheck = Standard_False;
//
if (aCTType == GeomAbs_Cone) {
Standard_Real a1 = Abs(aCTSurf->Cone().SemiAngle());
if (typs1 == GeomAbs_Cone || typs2 == GeomAbs_Cone) {
const gp_Cone aCon1 = (aCTType == GeomAbs_Cone) ?
aCTSurf->Cone() : aGeomSurf->Cone();
Standard_Real a1 = Abs(aCon1.SemiAngle());
bToCheck = (a1 < 0.02) || (a1 > 1.55);
//
if (typs1 == typs2) {
Standard_Real a2 = Abs(aGeomSurf->Cone().SemiAngle());
const gp_Cone aCon2 = aGeomSurf->Cone();
Standard_Real a2 = Abs(aCon2.SemiAngle());
bToCheck = bToCheck || (a2 < 0.02) || (a2 > 1.55);
//
if (a1 > 1.55 && a2 > 1.55) {//quasi-planes: if same domain, treat as canonic
const gp_Cone aCon1 = aCTSurf->Cone();
const gp_Cone aCon2 = aGeomSurf->Cone();
const gp_Ax1 A1 = aCon1.Axis(), A2 = aCon2.Axis();
if (A1.IsParallel(A2,Precision::Angular())) {
const gp_Pnt Apex1 = aCon1.Apex(), Apex2 = aCon2.Apex();
const gp_Pln Plan1( Apex1, A1.Direction() );
if (Plan1.Distance( Apex2 ) <= Precision::Confusion()) {
bToCheck = Standard_False;
bImp = 1;
}
}
}
}
//
aCTAx = aCTSurf->Cone().Axis();
TreatAsBiParametric = bToCheck;
if (aCTType == GeomAbs_Cone) {
aCTAx = aCon1.Axis();
}
else {
bToCheck = aCTSurf->Torus().MajorRadius() > aCTSurf->Torus().MinorRadius();
if (bToCheck && (typs1 == typs2)) {
bToCheck = aGeomSurf->Torus().MajorRadius() > aGeomSurf->Torus().MinorRadius();
}
aCTAx = aCTSurf->Torus().Axis();
//
if (typs1 == GeomAbs_Torus || typs2 == GeomAbs_Torus) {
const gp_Torus aTor1 = (aCTType == GeomAbs_Torus) ?
aCTSurf->Torus() : aGeomSurf->Torus();
bToCheck = aTor1.MajorRadius() > aTor1.MinorRadius();
if (typs1 == typs2) {
const gp_Torus aTor2 = aGeomSurf->Torus();
bToCheck = aTor2.MajorRadius() > aTor2.MinorRadius();
}
//
if (aCTType == GeomAbs_Torus) {
aCTAx = aTor1.Axis();
}
}
//
if (bToCheck) {
@ -787,11 +798,11 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
case GeomAbs_Plane: {
aGeomAx = aGeomSurf->Plane().Axis();
if (aCTType == GeomAbs_Cone) {
bImp = 1;
bGeomGeom = 1;
if (Abs(aCTSurf->Cone().SemiAngle()) < 0.02) {
Standard_Real ps = Abs(aCTAx.Direction().Dot(aGeomAx.Direction()));
if(ps < 0.015) {
bImp = 0;
bGeomGeom = 0;
}
}
}
@ -799,7 +810,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
if (aCTAx.IsParallel(aGeomAx, Precision::Angular()) ||
(aCTAx.IsNormal(aGeomAx, Precision::Angular()) &&
(aGeomSurf->Plane().Distance(aCTAx.Location()) < Precision::Confusion()))) {
bImp = 1;
bGeomGeom = 1;
}
}
bToCheck = Standard_False;
@ -807,7 +818,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
}
case GeomAbs_Sphere: {
if (aL1.Distance(aGeomSurf->Sphere().Location()) < Precision::Confusion()) {
bImp = 1;
bGeomGeom = 1;
}
bToCheck = Standard_False;
break;
@ -829,12 +840,12 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
if (bToCheck) {
if (aCTAx.IsParallel(aGeomAx, Precision::Angular()) &&
(aL1.Distance(aGeomAx.Location()) <= Precision::Confusion())) {
bImp = 1;
bGeomGeom = 1;
}
}
//
if (aCTType == GeomAbs_Cone) {
TreatAsBiParametric = (bImp == 0);
if (bGeomGeom == 1) {
TreatAsBiParametric = Standard_False;
}
}
}
@ -868,7 +879,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
case GeomAbs_Cylinder:
case GeomAbs_Sphere:
case GeomAbs_Cone: ts1 = 1; break;
case GeomAbs_Torus: ts1 = bImp; break;
case GeomAbs_Torus: ts1 = bGeomGeom; break;
default: break;
}
@ -879,7 +890,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
case GeomAbs_Cylinder:
case GeomAbs_Sphere:
case GeomAbs_Cone: ts2 = 1; break;
case GeomAbs_Torus: ts2 = bImp; break;
case GeomAbs_Torus: ts2 = bGeomGeom; break;
default: break;
}
//
@ -955,7 +966,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
//
//treatment of the cases with cone or torus
Standard_Boolean TreatAsBiParametric = Standard_False;
Standard_Integer bImp = 0;
Standard_Integer bGeomGeom = 0;
//
if (typs1 == GeomAbs_Cone || typs2 == GeomAbs_Cone ||
typs1 == GeomAbs_Torus || typs2 == GeomAbs_Torus) {
@ -971,36 +982,47 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
aCTType = aCTSurf->GetType();
bToCheck = Standard_False;
//
if (aCTType == GeomAbs_Cone) {
Standard_Real a1 = Abs(aCTSurf->Cone().SemiAngle());
if (typs1 == GeomAbs_Cone || typs2 == GeomAbs_Cone) {
const gp_Cone aCon1 = (aCTType == GeomAbs_Cone) ?
aCTSurf->Cone() : aGeomSurf->Cone();
Standard_Real a1 = Abs(aCon1.SemiAngle());
bToCheck = (a1 < 0.02) || (a1 > 1.55);
//
if (typs1 == typs2) {
Standard_Real a2 = Abs(aGeomSurf->Cone().SemiAngle());
const gp_Cone aCon2 = aGeomSurf->Cone();
Standard_Real a2 = Abs(aCon2.SemiAngle());
bToCheck = bToCheck || (a2 < 0.02) || (a2 > 1.55);
//
if (a1 > 1.55 && a2 > 1.55) {//quasi-planes: if same domain, treat as canonic
const gp_Cone aCon1 = aCTSurf->Cone();
const gp_Cone aCon2 = aGeomSurf->Cone();
const gp_Ax1 A1 = aCon1.Axis(), A2 = aCon2.Axis();
if (A1.IsParallel(A2,Precision::Angular())) {
const gp_Pnt Apex1 = aCon1.Apex(), Apex2 = aCon2.Apex();
const gp_Pln Plan1( Apex1, A1.Direction() );
if (Plan1.Distance( Apex2 ) <= Precision::Confusion()) {
bToCheck = Standard_False;
bImp = 1;
}
}
}
}
//
aCTAx = aCTSurf->Cone().Axis();
TreatAsBiParametric = bToCheck;
if (aCTType == GeomAbs_Cone) {
aCTAx = aCon1.Axis();
}
else {
bToCheck = aCTSurf->Torus().MajorRadius() > aCTSurf->Torus().MinorRadius();
if (bToCheck && (typs1 == typs2)) {
bToCheck = aGeomSurf->Torus().MajorRadius() > aGeomSurf->Torus().MinorRadius();
}
aCTAx = aCTSurf->Torus().Axis();
//
if (typs1 == GeomAbs_Torus || typs2 == GeomAbs_Torus) {
const gp_Torus aTor1 = (aCTType == GeomAbs_Torus) ?
aCTSurf->Torus() : aGeomSurf->Torus();
bToCheck = aTor1.MajorRadius() > aTor1.MinorRadius();
if (typs1 == typs2) {
const gp_Torus aTor2 = aGeomSurf->Torus();
bToCheck = aTor2.MajorRadius() > aTor2.MinorRadius();
}
//
if (aCTType == GeomAbs_Torus) {
aCTAx = aTor1.Axis();
}
}
//
if (bToCheck) {
@ -1010,11 +1032,11 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
case GeomAbs_Plane: {
aGeomAx = aGeomSurf->Plane().Axis();
if (aCTType == GeomAbs_Cone) {
bImp = 1;
bGeomGeom = 1;
if (Abs(aCTSurf->Cone().SemiAngle()) < 0.02) {
Standard_Real ps = Abs(aCTAx.Direction().Dot(aGeomAx.Direction()));
if(ps < 0.015) {
bImp = 0;
bGeomGeom = 0;
}
}
}
@ -1022,7 +1044,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
if (aCTAx.IsParallel(aGeomAx, Precision::Angular()) ||
(aCTAx.IsNormal(aGeomAx, Precision::Angular()) &&
(aGeomSurf->Plane().Distance(aCTAx.Location()) < Precision::Confusion()))) {
bImp = 1;
bGeomGeom = 1;
}
}
bToCheck = Standard_False;
@ -1030,7 +1052,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
}
case GeomAbs_Sphere: {
if (aL1.Distance(aGeomSurf->Sphere().Location()) < Precision::Confusion()) {
bImp = 1;
bGeomGeom = 1;
}
bToCheck = Standard_False;
break;
@ -1052,12 +1074,12 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
if (bToCheck) {
if (aCTAx.IsParallel(aGeomAx, Precision::Angular()) &&
(aL1.Distance(aGeomAx.Location()) <= Precision::Confusion())) {
bImp = 1;
bGeomGeom = 1;
}
}
//
if (aCTType == GeomAbs_Cone) {
TreatAsBiParametric = (bImp == 0);
if (bGeomGeom == 1) {
TreatAsBiParametric = Standard_False;
}
}
}
@ -1082,7 +1104,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
case GeomAbs_Cylinder:
case GeomAbs_Sphere:
case GeomAbs_Cone: ts1 = 1; break;
case GeomAbs_Torus: ts1 = bImp; break;
case GeomAbs_Torus: ts1 = bGeomGeom; break;
default: break;
}
@ -1093,7 +1115,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
case GeomAbs_Cylinder:
case GeomAbs_Sphere:
case GeomAbs_Cone: ts2 = 1; break;
case GeomAbs_Torus: ts2 = bImp; break;
case GeomAbs_Torus: ts2 = bGeomGeom; break;
default: break;
}
//
@ -1566,7 +1588,8 @@ void IntPatch_Intersection::Dump(const Standard_Integer ,
if(rlin->IsArcOnS2()) nbr2++;
}
else if(IType == IntPatch_Analytic) nba++;
else { nbg++;
else {
nbg++;
if(IType == IntPatch_Lin) nbgl++;
else if(IType == IntPatch_Circle) nbgc++;
else if(IType == IntPatch_Parabola) nbgp++;

36
tests/bugs/modalg_5/bug24648 Normal file
View File

@ -0,0 +1,36 @@
puts "==========="
puts "OCC24648"
puts "==========="
puts ""
##############################################################
# Different types of intersection curves between Cone and Torus with a different order of arguments
##############################################################
cone s1 60 0
torus s2 30 20
intersect i1 s1 s2
set info1 [dump i1_1]
intersect i2 s2 s1
set info2 [dump i2_1]
set type_of_curve "Circle"
if { [regexp ${type_of_curve} ${info1}] != 1 } {
puts "Error : Wrong type of intersection curve #1"
} else {
puts "OK : Good type of intersection curve #1"
}
if { [regexp ${type_of_curve} ${info2}] != 1 } {
puts "Error : Wrong type of intersection curve #2"
} else {
puts "OK : Good type of intersection curve #2"
}
smallview
donly i1_1 i2_1
fit
set only_screen_axo 1