ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022819: [CEA 1339] : Regression : the distance between a sphere and a embedded box is not zero

Browse Source 
0022820: [CEA 1342] Regression: the distance between a sphere and a cylinder that touch is not zero
This commit is contained in:
vsr 2014-12-02 18:46:31 +03:00
parent 01b4ca144c
commit 4b06093853
1 changed files with 64 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/GEOMUtils/GEOMUtils.cxx
View File

@ -44,6 +44,7 @@
#include <BRepClass3d_SolidClassifier.hxx> #include <BRepClass3d_SolidClassifier.hxx>
#include <BRepBuilderAPI_MakeFace.hxx> #include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepBuilderAPI_Sewing.hxx>
#include <Bnd_Box.hxx> #include <Bnd_Box.hxx>
@ -112,7 +113,6 @@ namespace
TopoDS_Shape &theModifiedShape, TopoDS_Shape &theModifiedShape,
Standard_Real &theAddDist) Standard_Real &theAddDist)
{ {
Standard_Boolean isModified = Standard_False;
TopExp_Explorer anExp; TopExp_Explorer anExp;
int nbf = 0; int nbf = 0;
@ -136,80 +136,74 @@ namespace
const Standard_Boolean isShell = const Standard_Boolean isShell =
(sh.ShapeType()==TopAbs_SHELL || sh.ShapeType()==TopAbs_FACE); (sh.ShapeType()==TopAbs_SHELL || sh.ShapeType()==TopAbs_FACE);
if( isShell || S->IsUPeriodic() ) { if ( !isShell && S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ) {
// non solid case or any periodic surface (Mantis 22454). Handle(Geom_SphericalSurface) SS = Handle(Geom_SphericalSurface)::DownCast(S);
double U1,U2,V1,V2; gp_Pnt PC = SS->Location();
// changes for 0020677: EDF 1219 GEOM: MinDistance gives 0 instead of 20.88
//S->Bounds(U1,U2,V1,V2); changed by
ShapeAnalysis::GetFaceUVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
// end of changes for 020677 (dmv)
Handle(Geom_RectangularTrimmedSurface) TrS1 =
new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);
Handle(Geom_RectangularTrimmedSurface) TrS2 =
new Geom_RectangularTrimmedSurface(S,(U1+U2)/2.,U2,V1,V2);
BRep_Builder B; BRep_Builder B;
TopoDS_Face F1,F2; TopoDS_Vertex V;
TopoDS_Shape aMShape; B.MakeVertex(V,PC,1.e-7);
theModifiedShape = V;
if (isShell) { theAddDist = SS->Radius();
B.MakeCompound(TopoDS::Compound(aMShape)); return Standard_True;
} else {
B.MakeShell(TopoDS::Shell(aMShape));
}
B.MakeFace(F1,TrS1,1.e-7);
B.Add(aMShape,F1);
B.MakeFace(F2,TrS2,1.e-7);
B.Add(aMShape,F2);
Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
if (!isShell) {
// The original shape is a solid.
TopoDS_Solid aSolid;
B.MakeSolid(aSolid);
B.Add(aSolid, aMShape);
aMShape = aSolid;
}
sfs->Init(aMShape);
sfs->SetPrecision(1.e-6);
sfs->SetMaxTolerance(1.0);
sfs->Perform();
theModifiedShape = sfs->Shape();
isModified = Standard_True;
} }
else { if ( !isShell && S->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
if( S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ) { Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(S);
Handle(Geom_SphericalSurface) SS = Handle(Geom_SphericalSurface)::DownCast(S); gp_Ax3 ax3 = TS->Position();
gp_Pnt PC = SS->Location(); Handle(Geom_Circle) C = new Geom_Circle(ax3.Ax2(),TS->MajorRadius());
BRep_Builder B; BRep_Builder B;
TopoDS_Vertex V; TopoDS_Edge E;
B.MakeVertex(V,PC,1.e-7); B.MakeEdge(E,C,1.e-7);
theModifiedShape = V; theModifiedShape = E;
theAddDist = SS->Radius(); theAddDist = TS->MinorRadius();
isModified = Standard_True; return Standard_True;
}
else {
Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(S);
gp_Ax3 ax3 = TS->Position();
Handle(Geom_Circle) C = new Geom_Circle(ax3.Ax2(),TS->MajorRadius());
BRep_Builder B;
TopoDS_Edge E;
B.MakeEdge(E,C,1.e-7);
theModifiedShape = E;
theAddDist = TS->MinorRadius();
isModified = Standard_True;
}
} }
} else {
theModifiedShape = theShape; // non solid case or any periodic surface (Mantis 22454).
double U1,U2,V1,V2;
// changes for 0020677: EDF 1219 GEOM: MinDistance gives 0 instead of 20.88
//S->Bounds(U1,U2,V1,V2); changed by
ShapeAnalysis::GetFaceUVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
// end of changes for 020677 (dmv)
Handle(Geom_RectangularTrimmedSurface) TrS1 =
new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);
Handle(Geom_RectangularTrimmedSurface) TrS2 =
new Geom_RectangularTrimmedSurface(S,(U1+U2)/2.,U2,V1,V2);
TopoDS_Shape aMShape;
TopoDS_Face F1 = BRepBuilderAPI_MakeFace(TrS1, Precision::Confusion());
TopoDS_Face F2 = BRepBuilderAPI_MakeFace(TrS2, Precision::Confusion());
if (isShell) {
BRep_Builder B;
B.MakeCompound(TopoDS::Compound(aMShape));
B.Add(aMShape, F1);
B.Add(aMShape, F2);
} else {
// The original shape is a solid.
BRepBuilderAPI_Sewing aSewing (Precision::Confusion()*10.0);
aSewing.Add(F1);
aSewing.Add(F2);
aSewing.Perform();
aMShape = aSewing.SewedShape();
BRep_Builder B;
TopoDS_Solid aSolid;
B.MakeSolid(aSolid);
B.Add(aSolid, aMShape);
aMShape = aSolid;
}
Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
sfs->Init(aMShape);
sfs->SetPrecision(1.e-6);
sfs->SetMaxTolerance(1.0);
sfs->Perform();
theModifiedShape = sfs->Shape();
return Standard_True;
} }
} }
else
theModifiedShape = theShape; theModifiedShape = theShape;
return Standard_False;
return isModified;
} }
//======================================================================= //=======================================================================