-#include <Standard_Stream.hxx>
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
-#include <BRepOffsetAPI_MakeFilling.hxx>
+#include <Standard_Stream.hxx>
#include <GEOMImpl_Block6Explorer.hxx>
+#include <ShHealOper_ShapeProcess.hxx>
+
#include "utilities.h"
#include <BRep_Tool.hxx>
#include <BRep_TFace.hxx>
+#include <BRep_Builder.hxx>
+#include <BRepLib.hxx>
+#include <BRepLib_FindSurface.hxx>
#include <BRepTools.hxx>
#include <BRepTools_WireExplorer.hxx>
#include <BRepOffsetAPI_ThruSections.hxx>
+#include <BRepOffsetAPI_MakeFilling.hxx>
+#include <BRepCheck_Analyzer.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
myEdges(edge_id(2, i)) = anEdges2(nb);
}
+ // check the wires closure
+ TopoDS_Wire wire1 = TopoDS::Wire(aWire1);
+ TopoDS_Wire wire2 = TopoDS::Wire(aWire2);
+ TopoDS_Vertex aV1, aV2;
+
+ TopExp::Vertices(wire1, aV1, aV2);
+ if ( !aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2) )
+ aWire1.Closed( true );
+
+ TopExp::Vertices(wire2, aV1, aV2);
+ if ( !aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2) )
+ aWire2.Closed( true );
+
// 4. Generate side surface
if (!aWire1.Closed() || !aWire2.Closed()) {
// BRepOffsetAPI_ThruSections is not applicable on not closed wires
return;
}
- // try to construct filling surface
if (!isPlanarWanted) {
+ // try to construct filling surface
BRepOffsetAPI_MakeFilling MF;
Standard_Integer nbEdges = 0;
// Result of filling
TopoDS_Shape aFace = MF.Shape();
- // Update tolerance
- Standard_Real aTol = MF.G0Error();
-
- TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire
- BRepTools_WireExplorer aWE1 (theWire);
- Standard_Integer vi = 1;
- for (; aWE1.More() && vi <= nbEdges; aWE1.Next(), vi++) {
- aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE1.CurrentVertex()));
+ // 12.04.2006 for PAL12149 begin
+ Handle(Geom_Surface) aGS = BRep_Tool::Surface(TopoDS::Face(aFace));
+ BRepBuilderAPI_MakeFace MK1 (aGS, theWire);
+ if (MK1.IsDone()) {
+ TopoDS_Shape aFace1 = MK1.Shape();
+
+ BRepCheck_Analyzer ana (aFace1, false);
+ if (!ana.IsValid()) {
+ TopoDS_Shape aFace2;
+ ShHealOper_ShapeProcess aHealer;
+ aHealer.Perform(aFace1, aFace2);
+ if (aHealer.isDone())
+ theResult = aFace2;
+ }
}
+ // 12.04.2006 for PAL12149 end
+
+ if (theResult.IsNull()) { // try to deal with pure result of filling
+ // Update tolerance
+ Standard_Real aTol = MF.G0Error();
- // Find maximum deviation in vertices
- TopExp_Explorer exp (aFace, TopAbs_VERTEX);
- TopTools_MapOfShape mapShape;
- for (; exp.More(); exp.Next()) {
- if (mapShape.Add(exp.Current())) {
- TopoDS_Vertex aV = TopoDS::Vertex(exp.Current());
- Standard_Real aTolV = BRep_Tool::Tolerance(aV);
- gp_Pnt aP = BRep_Tool::Pnt(aV);
- Standard_Real min_dist = aP.Distance(aPnts(1));
- for (vi = 2; vi <= nbEdges; vi++) {
- min_dist = Min(min_dist, aP.Distance(aPnts(vi)));
+ TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire
+ BRepTools_WireExplorer aWE1 (theWire);
+ Standard_Integer vi = 1;
+ for (; aWE1.More() && vi <= nbEdges; aWE1.Next(), vi++) {
+ aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE1.CurrentVertex()));
+ }
+
+ // Find maximum deviation in vertices
+ TopExp_Explorer exp (aFace, TopAbs_VERTEX);
+ TopTools_MapOfShape mapShape;
+ for (; exp.More(); exp.Next()) {
+ if (mapShape.Add(exp.Current())) {
+ TopoDS_Vertex aV = TopoDS::Vertex(exp.Current());
+ Standard_Real aTolV = BRep_Tool::Tolerance(aV);
+ gp_Pnt aP = BRep_Tool::Pnt(aV);
+ Standard_Real min_dist = aP.Distance(aPnts(1));
+ for (vi = 2; vi <= nbEdges; vi++) {
+ min_dist = Min(min_dist, aP.Distance(aPnts(vi)));
+ }
+ aTol = Max(aTol, aTolV);
+ aTol = Max(aTol, min_dist);
}
- aTol = Max(aTol, aTolV);
- aTol = Max(aTol, min_dist);
}
- }
- if ((*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance() < aTol) {
- (*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance(aTol);
+ if ((*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance() < aTol) {
+ (*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance(aTol);
+ }
+ theResult = aFace;
}
- theResult = aFace;
}
+ } else {
+ // try to update wire tolerances to build a planar face
+
+#if 1 //(OCC_VERSION_MAJOR < 6) || (OCC_VERSION_MAJOR == 6 && OCC_VERSION_MINOR <= 1)
+ // Find a deviation
+ Standard_Real aToleranceReached, aTol;
+ BRepLib_FindSurface aFS;
+ aFS.Init(theWire, -1., isPlanarWanted);
+ aToleranceReached = aFS.ToleranceReached();
+ aTol = aFS.Tolerance();
+
+ if (!aFS.Found()) {
+ aFS.Init(theWire, aToleranceReached, isPlanarWanted);
+ if (!aFS.Found()) return;
+ aToleranceReached = aFS.ToleranceReached();
+ aTol = aFS.Tolerance();
+ }
+ aTol = Max(1.2 * aToleranceReached, aTol);
+
+ // Copy the wire, bacause it can be updated with very-very big tolerance here
+ BRepBuilderAPI_Copy aMC (theWire);
+ if (!aMC.IsDone()) return;
+ TopoDS_Wire aWire = TopoDS::Wire(aMC.Shape());
+ // Update tolerances to <aTol>
+ BRep_Builder B;
+ for (TopExp_Explorer expE (aWire, TopAbs_EDGE); expE.More(); expE.Next()) {
+ TopoDS_Edge anE = TopoDS::Edge(expE.Current());
+ B.UpdateEdge(anE, aTol);
+ }
+ for (TopExp_Explorer expV (aWire, TopAbs_VERTEX); expV.More(); expV.Next()) {
+ TopoDS_Vertex aV = TopoDS::Vertex(expV.Current());
+ B.UpdateVertex(aV, aTol);
+ }
+ //BRepLib::UpdateTolerances(aWire);
+ // Build face
+ BRepBuilderAPI_MakeFace MK1 (aWire, isPlanarWanted);
+ if (MK1.IsDone()) {
+ theResult = MK1.Shape();
+ return;
+ }
+
+#else // After migration on OCCT version, containing PKV's fix. See bug 8293
+ BRepLib_MakeFace aBMF;
+ aBMF.Init(theWire, isPlanarWanted, Standard_True);
+ if (aBMF.Error() == BRepLib_FaceDone) {
+ theResult = aBMF.Shape();
+ return;
+ }
+#endif
}
}
