-// Copyright (C) 2005 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.
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// 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
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// See http://www.salome-platform.org/
+// 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.
//
-#include <Standard_Stream.hxx>
+// 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 <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 <Geom_TrimmedCurve.hxx>
#include <GeomFill_Generator.hxx>
+#include <gce_MakePln.hxx>
+
#include <Precision.hxx>
#include <gp_Pnt.hxx>
+#include <gp_Pln.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <StdFail_NotDone.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
const Standard_Boolean isPlanarWanted,
TopoDS_Shape& theResult)
{
- // try to build face on plane or on any surface under the edges of the wire
- BRepBuilderAPI_MakeFace MK (theWire, isPlanarWanted);
- if (MK.IsDone()) {
- theResult = MK.Shape();
- return;
+ // Workaround for Mantis issue 0020956
+ if (isPlanarWanted) {
+ // Count the number of points in the wire.
+ // Collect the first three points.
+ gp_Pnt p1, p2, p3;
+ bool is3Pnts(false);
+ bool p1set(false), p2set(false), p3set(false);
+ BRepTools_WireExplorer wexpl(theWire);
+ for (; wexpl.More(); wexpl.Next()) {
+ if (!p1set) {
+ p1set = true;
+ p1 = BRep_Tool::Pnt(wexpl.CurrentVertex());
+ }
+ else if (!p2set) {
+ p2set = true;
+ p2 = BRep_Tool::Pnt(wexpl.CurrentVertex());
+ }
+ else if (!p3set) {
+ p3set = true;
+ is3Pnts = true;
+ p3 = BRep_Tool::Pnt(wexpl.CurrentVertex());
+ }
+ else {
+ is3Pnts = false;
+ break;
+ }
+ }
+
+ // Construct a plane for the case of three points in the wire.
+ gp_Pln plane;
+ if (is3Pnts) {
+ gce_MakePln mkPln(p1, p2, p3);
+ if (mkPln.IsDone()) {
+ plane = mkPln.Value();
+ }
+ else {
+ is3Pnts = false;
+ }
+ }
+
+ // Construct a face based on the plane (in case of three points in the wire) or
+ // allow MakeFace to build the plane itself (in case of the number of points is greater than 3).
+ if (is3Pnts) {
+ BRepBuilderAPI_MakeFace MK (plane, theWire, isPlanarWanted);
+ if (MK.IsDone()) {
+ theResult = MK.Shape();
+ return;
+ }
+ }
+ else {
+ BRepBuilderAPI_MakeFace MK (theWire, isPlanarWanted);
+ if (MK.IsDone()) {
+ theResult = MK.Shape();
+ return;
+ }
+ }
+ }
+ else {
+ // try to build face on plane or on any surface under the edges of the wire
+ BRepBuilderAPI_MakeFace MK (theWire, isPlanarWanted);
+ if (MK.IsDone()) {
+ theResult = MK.Shape();
+ return;
+ }
}
if (!isPlanarWanted) {
// 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
- // 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)));
+ if (theResult.IsNull()) { // try to deal with pure result of filling
+ // 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()));
+ }
+
+ // 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
- // With OCCT6.0 or lower
-
+#if 1 //(OCC_VERSION_MAJOR < 6) || (OCC_VERSION_MAJOR == 6 && OCC_VERSION_MINOR <= 1)
// Find a deviation
Standard_Real aToleranceReached, aTol;
BRepLib_FindSurface aFS;
return;
}
- // After migration on OCCT version higher than 6.0
- //BRepLib_MakeFace aBMF;
- //aBMF.Init(theWire, isPlanarWanted, Standard_True);
- //if (aBMF.Error() == BRepLib_FaceDone) {
- // theResult = aBMF.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
}
}
