ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-24 00:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

A patch by JGV for correct usage of filling in function MakeAnyFace.

Browse Source
This commit is contained in:
jfa 2012-03-29 14:04:01 +00:00
parent 0304ec44b3
commit 332a5b2f74
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
View File

@ -27,6 +27,8 @@
#include "utilities.h" #include "utilities.h"
#include <Basics_OCCTVersion.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRep_TFace.hxx> #include <BRep_TFace.hxx>
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
@ -994,12 +996,12 @@ void GEOMImpl_Block6Explorer::InitByTwoFaces (const TopoDS_Shape& theFace1,
TopoDS_Vertex aV1, aV2; TopoDS_Vertex aV1, aV2;
TopExp::Vertices(wire1, aV1, aV2); TopExp::Vertices(wire1, aV1, aV2);
if ( !aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2) ) if (!aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2))
aWire1.Closed( true ); aWire1.Closed(true);
TopExp::Vertices(wire2, aV1, aV2); TopExp::Vertices(wire2, aV1, aV2);
if ( !aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2) ) if (!aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2))
aWire2.Closed( true ); aWire2.Closed(true);
// 4. Generate side surface // 4. Generate side surface
if (!aWire1.Closed() || !aWire2.Closed()) { if (!aWire1.Closed() || !aWire2.Closed()) {
@ -1358,6 +1360,20 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeAnyFace (const TopoDS_Wire&
// 12.04.2006 for PAL12149 begin // 12.04.2006 for PAL12149 begin
Handle(Geom_Surface) aGS = BRep_Tool::Surface(TopoDS::Face(aFace)); Handle(Geom_Surface) aGS = BRep_Tool::Surface(TopoDS::Face(aFace));
#if OCC_VERSION_LARGE > 0x06050200
BRep_Builder BB;
TopoDS_Iterator itw(theWire);
for (; itw.More(); itw.Next())
{
const TopoDS_Edge& anEdge = TopoDS::Edge(itw.Value());
TopoDS_Edge NewEdge = TopoDS::Edge(MF.Generated(anEdge).First());
Standard_Real fpar, lpar;
Handle(Geom2d_Curve) NewPCurve = BRep_Tool::CurveOnSurface(NewEdge, TopoDS::Face(aFace), fpar, lpar);
TopLoc_Location aLoc;
Standard_Real NewTol = BRep_Tool::Tolerance(NewEdge);
BB.UpdateEdge(anEdge, NewPCurve, aGS, aLoc, NewTol);
}
#endif
BRepBuilderAPI_MakeFace MK1 (aGS, theWire); BRepBuilderAPI_MakeFace MK1 (aGS, theWire);
if (MK1.IsDone()) { if (MK1.IsDone()) {
TopoDS_Shape aFace1 = MK1.Shape(); TopoDS_Shape aFace1 = MK1.Shape();