OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

A fix by mzernova for OCCT bugs 33664 and 33755 (Salome issues 42465 and 42518

Browse Source
This commit is contained in:
jfa 2024-08-01 11:50:57 +01:00
parent 658f6b0632
commit b797db2837
1 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/StdSelect/StdSelect_BRepSelectionTool.cxx
View File

@ -66,45 +66,10 @@
#define BVH_PRIMITIVE_LIMIT 800000 #define BVH_PRIMITIVE_LIMIT 800000
namespace // The following flag can be used to enable optimization of cone/cylinder selection
{ // Unfortunately, this optimization is not stable and may lead to incorrect selection
//======================================================================= // in some cases. It is disabled by default.
// function : getCylinderCircles //#define OPTIMIZE_CONE_CYLINDER_SELECTION
// purpose : Extracts up to two circular edges from a hollow cylinder face
//=======================================================================
std::array<gp_Circ, 2> getCylinderCircles(const TopoDS_Face& theHollowCylinder,
Standard_Size& theNumCircles)
{
std::array<gp_Circ, 2> aCircles; // Array to store up to two circles
theNumCircles = 0; // Initialize the number of circles found
Standard_Integer aLinesNb = 0; // Counter for the number of edges processed
for (TopExp_Explorer anEdgeExp(theHollowCylinder, TopAbs_EDGE); anEdgeExp.More();
anEdgeExp.Next())
{
const TopoDS_Edge& anEdge = TopoDS::Edge(anEdgeExp.Current());
BRepAdaptor_Curve anAdaptor(anEdge);
aLinesNb++;
if (anAdaptor.GetType() == GeomAbs_Circle && BRep_Tool::IsClosed(anEdge))
{
theNumCircles++;
aCircles[theNumCircles - 1] = anAdaptor.Circle();
}
else if (anAdaptor.GetType() != GeomAbs_Line || aLinesNb > 4)
{
theNumCircles = 0;
return std::array<gp_Circ, 2>();
}
if (theNumCircles == 2)
{
break;
}
}
return aCircles;
}
} // namespace
//================================================== //==================================================
// function: PreBuildBVH // function: PreBuildBVH
@ -642,6 +607,48 @@ void StdSelect_BRepSelectionTool::GetEdgeSensitive(const TopoDS_Shape&
} }
} }
#ifdef OPTIMIZE_CONE_CYLINDER_SELECTION
namespace
{
//=======================================================================
// function : getCylinderCircles
// purpose : Extracts up to two circular edges from a hollow cylinder face
//=======================================================================
std::array<gp_Circ, 2> getCylinderCircles(const TopoDS_Face& theHollowCylinder,
Standard_Size& theNumCircles)
{
std::array<gp_Circ, 2> aCircles; // Array to store up to two circles
theNumCircles = 0; // Initialize the number of circles found
Standard_Integer aLinesNb = 0; // Counter for the number of edges processed
for (TopExp_Explorer anEdgeExp(theHollowCylinder, TopAbs_EDGE); anEdgeExp.More();
anEdgeExp.Next())
{
const TopoDS_Edge& anEdge = TopoDS::Edge(anEdgeExp.Current());
BRepAdaptor_Curve anAdaptor(anEdge);
aLinesNb++;
if (anAdaptor.GetType() == GeomAbs_Circle && BRep_Tool::IsClosed(anEdge))
{
theNumCircles++;
aCircles[theNumCircles - 1] = anAdaptor.Circle();
}
else if (anAdaptor.GetType() != GeomAbs_Line || aLinesNb > 4)
{
theNumCircles = 0;
return std::array<gp_Circ, 2>();
}
if (theNumCircles == 2)
{
break;
}
}
return aCircles;
}
} // namespace
#endif /*OPTIMIZE_CONE_CYLINDER_SELECTION*/
//================================================================================================= //=================================================================================================
Standard_Boolean StdSelect_BRepSelectionTool::GetSensitiveForFace( Standard_Boolean StdSelect_BRepSelectionTool::GetSensitiveForFace(
@ -688,6 +695,7 @@ Standard_Boolean StdSelect_BRepSelectionTool::GetSensitiveForFace(
return Standard_True; return Standard_True;
} }
} }
#ifdef OPTIMIZE_CONE_CYLINDER_SELECTION
else if (Handle(Geom_ConicalSurface) aGeomCone = Handle(Geom_ConicalSurface)::DownCast(aSurf)) else if (Handle(Geom_ConicalSurface) aGeomCone = Handle(Geom_ConicalSurface)::DownCast(aSurf))
{ {
Standard_Size aNumCircles; Standard_Size aNumCircles;
@ -748,6 +756,7 @@ Standard_Boolean StdSelect_BRepSelectionTool::GetSensitiveForFace(
return Standard_True; return Standard_True;
} }
} }
#endif /*OPTIMIZE_CONE_CYLINDER_SELECTION*/
else if (Handle(Geom_Plane) aGeomPlane = Handle(Geom_Plane)::DownCast(aSurf)) else if (Handle(Geom_Plane) aGeomPlane = Handle(Geom_Plane)::DownCast(aSurf))
{ {
TopTools_IndexedMapOfShape aSubfacesMap; TopTools_IndexedMapOfShape aSubfacesMap;