-
-using namespace std;
-
-#include "GEOMImpl_FillingDriver.hxx"
-#include "GEOM_Function.hxx"
-#include "GEOMImpl_IFilling.hxx"
-#include "GEOMImpl_Types.hxx"
+// Copyright (C) 2007-2008 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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_FillingDriver.hxx>
+#include <GEOM_Function.hxx>
+#include <GEOMImpl_IFilling.hxx>
+#include <GEOMImpl_Types.hxx>
#include <BRep_Tool.hxx>
#include <BRepAlgo.hxx>
#include <Precision.hxx>
#include <Standard_ConstructionError.hxx>
+#include <TColGeom_SequenceOfCurve.hxx>
+#include <ShapeFix_Face.hxx>
+#include <GeomAPI_PointsToBSplineSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
+
//=======================================================================
//function : GetID
//purpose :
Standard_Real tol3d = IF.GetTol2D();
Standard_Real tol2d = IF.GetTol3D();
Standard_Integer nbiter = IF.GetNbIter();
+ Standard_Boolean isApprox = IF.GetApprox();
if (mindeg > maxdeg) {
Standard_RangeError::Raise("Minimal degree can not be more than maximal degree");
TopoDS_Shape Scurrent;
Standard_Real First, Last;
Handle(Geom_Curve) C;
- GeomFill_SectionGenerator Section;
-
- Standard_Integer i = 0;
- for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
- Scurrent = Ex.Current() ;
- if (Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0;
- C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
- C = new Geom_TrimmedCurve(C, First, Last);
- Section.AddCurve(C);
- i++;
- }
- /* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
- Section.Perform(Precision::Confusion());
- Handle(GeomFill_Line) Line = new GeomFill_Line(i);
-
- GeomFill_AppSurf App (mindeg, maxdeg, tol3d, tol2d, nbiter); /* user parameters */
- App.Perform(Line, Section);
-
- if (!App.IsDone()) return 0;
- Standard_Integer UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots;
- App.SurfShape(UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots);
- Handle(Geom_BSplineSurface) GBS = new Geom_BSplineSurface
- (App.SurfPoles(), App.SurfWeights(), App.SurfUKnots(), App.SurfVKnots(),
- App.SurfUMults(), App.SurfVMults(), App.UDegree(), App.VDegree());
+ TopoDS_Iterator It (aShape);
+ for (; It.More(); It.Next()) {
+ Scurrent = It.Value();
+ if (Scurrent.ShapeType() != TopAbs_EDGE)
+ Standard_ConstructionError::Raise("The argument compound must contain only edges");
+ }
- if (GBS.IsNull()) return 0;
- aShape = BRepBuilderAPI_MakeFace(GBS);
+ if (!isApprox) {
+ // make filling as in old version of SALOME (before 4.1.1)
+ GeomFill_SectionGenerator Section;
+ Standard_Integer i = 0;
+ for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
+ Scurrent = Ex.Current();
+ if (Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0;
+ if (BRep_Tool::Degenerated(TopoDS::Edge(Scurrent))) continue;
+ C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
+ C = new Geom_TrimmedCurve(C, First, Last);
+ Section.AddCurve(C);
+ i++;
+ }
+
+ /* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
+ Section.Perform(Precision::Confusion());
+ Handle(GeomFill_Line) Line = new GeomFill_Line(i);
+
+ GeomFill_AppSurf App (mindeg, maxdeg, tol3d, tol2d, nbiter); /* user parameters */
+ App.Perform(Line, Section);
+
+ if (!App.IsDone()) return 0;
+ Standard_Integer UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots;
+ App.SurfShape(UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots);
+ Handle(Geom_BSplineSurface) GBS = new Geom_BSplineSurface
+ (App.SurfPoles(), App.SurfWeights(), App.SurfUKnots(), App.SurfVKnots(),
+ App.SurfUMults(), App.SurfVMults(), App.UDegree(), App.VDegree());
+
+ if (GBS.IsNull()) return 0;
+ aShape = BRepBuilderAPI_MakeFace(GBS);
+ }
+ else {
+ // implemented by skl 20.03.2008 for bug 16568
+ // make approximation - try to create bspline surface
+ // using GeomAPI_PointsToBSplineSurface
+ TColGeom_SequenceOfCurve aSeq;
+ int MaxNbPoles = 0;
+ // add curves from edges to sequence and find maximal
+ // number of poles if some of them are bsplines
+ for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
+ Scurrent = Ex.Current();
+ if (Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0;
+ if (BRep_Tool::Degenerated(TopoDS::Edge(Scurrent))) continue;
+ C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
+ Handle(Geom_TrimmedCurve) TC = Handle(Geom_TrimmedCurve)::DownCast(C);
+ if(TC.IsNull()) {
+ Handle(Geom_BSplineCurve) BC = Handle(Geom_BSplineCurve)::DownCast(C);
+ if(!BC.IsNull()) {
+ MaxNbPoles = Max(MaxNbPoles,BC->NbPoles());
+ }
+ }
+ else {
+ Handle(Geom_BSplineCurve) BC = Handle(Geom_BSplineCurve)::DownCast(TC->BasisCurve());
+ if(BC.IsNull()) {
+ Handle(Geom_TrimmedCurve) TC1 = Handle(Geom_TrimmedCurve)::DownCast(TC->BasisCurve());
+ if(!TC1.IsNull()) {
+ BC = Handle(Geom_BSplineCurve)::DownCast(TC1->BasisCurve());
+ }
+ }
+ if(!BC.IsNull()) {
+ MaxNbPoles = Max(MaxNbPoles,BC->NbPoles());
+ }
+ }
+ aSeq.Append(C);
+ }
+ // prepare array of points for creation bspline surface
+ // size of this array: by U parameter - number of curves,
+ // by V parameter - determ using MaxNbPoles but it's
+ // value must be between 21(min) and 101(max)
+ int nbc = aSeq.Length();
+ int nbp = Max(21,2*MaxNbPoles-1);
+ if(nbp>101) nbp = 101;
+ TColgp_Array2OfPnt Points(1,nbc,1,nbp);
+ int ic = 1;
+ for(; ic<=nbc; ic++) {
+ Handle(Geom_Curve) C = aSeq.Value(ic);
+ double fp = C->FirstParameter();
+ double lp = C->LastParameter();
+ double dp = (lp-fp)/(nbp-1);
+ int j = 0;
+ gp_Pnt P;
+ for(; j<nbp; j++) {
+ C->D0(fp+dp*j,P);
+ Points.SetValue(ic,j+1,P);
+ }
+ }
+ GeomAPI_PointsToBSplineSurface PTB(Points,mindeg,maxdeg,GeomAbs_C2,tol3d);
+ Handle(Geom_BSplineSurface) BS = PTB.Surface();
+ BRepBuilderAPI_MakeFace BB(BS);
+ TopoDS_Face NewF = BB.Face();
+ Handle(ShapeFix_Face) sff = new ShapeFix_Face(NewF);
+ sff->Perform();
+ sff->FixOrientation();
+ aShape = sff->Face();
+ }
/* We test the validity of resulting shape */
if (!BRepAlgo::IsValid((aShape))) {
