suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Part: ModelRefine: fix for bug# 2097

Browse Source
This commit is contained in:
blobfish 2015-05-15 18:06:33 +02:00 committed by wmayer
parent 25da93e2ea
commit cb2002d188
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Mod/Part/App/modelRefine.cpp
View File

@ -26,6 +26,7 @@
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <Geom_RectangularTrimmedSurface.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomAdaptor_Surface.hxx>
#include <Geom_Plane.hxx> #include <Geom_Plane.hxx>
#include <Geom_CylindricalSurface.hxx> #include <Geom_CylindricalSurface.hxx>
@ -343,12 +344,31 @@ FaceTypedPlane::FaceTypedPlane() : FaceTypedBase(GeomAbs_Plane)
{ {
} }
static Handle(Geom_Plane) getGeomPlane(const TopoDS_Face &faceIn)
{
Handle_Geom_Plane planeSurfaceOut;
Handle_Geom_Surface surface = BRep_Tool::Surface(faceIn);
if (!surface.IsNull())
{
planeSurfaceOut = Handle(Geom_Plane)::DownCast(surface);
if (planeSurfaceOut.IsNull())
{
Handle_Geom_RectangularTrimmedSurface trimmedSurface = Handle(Geom_RectangularTrimmedSurface)::DownCast(surface);
if (!trimmedSurface.IsNull())
planeSurfaceOut = Handle(Geom_Plane)::DownCast(trimmedSurface->BasisSurface());
}
}
return planeSurfaceOut;
}
bool FaceTypedPlane::isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const bool FaceTypedPlane::isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const
{ {
Handle(Geom_Plane) planeSurfaceOne = Handle(Geom_Plane)::DownCast(BRep_Tool::Surface(faceOne)); Handle(Geom_Plane) planeSurfaceOne = getGeomPlane(faceOne);
Handle(Geom_Plane) planeSurfaceTwo = Handle(Geom_Plane)::DownCast(BRep_Tool::Surface(faceTwo)); Handle(Geom_Plane) planeSurfaceTwo = getGeomPlane(faceTwo);
if (planeSurfaceOne.IsNull() || planeSurfaceTwo.IsNull()) if (planeSurfaceOne.IsNull() || planeSurfaceTwo.IsNull())
return false;//error? return false;//error?
gp_Pln planeOne(planeSurfaceOne->Pln()); gp_Pln planeOne(planeSurfaceOne->Pln());
gp_Pln planeTwo(planeSurfaceTwo->Pln()); gp_Pln planeTwo(planeSurfaceTwo->Pln());
return (planeOne.Position().Direction().IsParallel(planeTwo.Position().Direction(), Precision::Confusion()) && return (planeOne.Position().Direction().IsParallel(planeTwo.Position().Direction(), Precision::Confusion()) &&