-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
// 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 <BRep_Tool.hxx>
#include <BRepAlgo.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
#include <TopAbs.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
+#include <TopoDS_Compound.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
#include <TopExp_Explorer.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <Geom_TrimmedCurve.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Circle.hxx>
+#include <Geom_Ellipse.hxx>
+#include <Geom_BezierCurve.hxx>
#include <Geom_BSplineSurface.hxx>
#include <GeomFill_Line.hxx>
#include <GeomFill_AppSurf.hxx>
#include <ShapeFix_Face.hxx>
#include <GeomAPI_PointsToBSplineSurface.hxx>
#include <Geom_BSplineCurve.hxx>
+#include <GeomAPI_PointsToBSpline.hxx>
+
+#include <TColgp_SequenceOfPnt.hxx>
+#include <TColgp_Array1OfPnt.hxx>
+
+//#include <BRepTools.hxx>
+
//=======================================================================
//function : GetID
GEOMImpl_IFilling IF (aFunction);
Handle(GEOM_Function) aShapeFunction = IF.GetShape();
if (aShapeFunction.IsNull()) return 0;
- TopoDS_Shape aShape = aShapeFunction->GetValue();
+ TopoDS_Shape aShape;
+
+ BRepBuilderAPI_Copy Copy(aShapeFunction->GetValue());
+ if( Copy.IsDone() )
+ aShape = Copy.Shape();
+
if (aShape.IsNull() || aShape.ShapeType() != TopAbs_COMPOUND) return 0;
Standard_Integer mindeg = IF.GetMinDeg();
Standard_Real tol2d = IF.GetTol3D();
Standard_Integer nbiter = IF.GetNbIter();
Standard_Boolean isApprox = IF.GetApprox();
+ Standard_Integer aMethod = IF.GetMethod();
if (mindeg > maxdeg) {
Standard_RangeError::Raise("Minimal degree can not be more than maximal degree");
Standard_Real First, Last;
Handle(Geom_Curve) C;
+ TopoDS_Compound aComp;
+ BRep_Builder B;
+ B.MakeCompound(aComp);
+
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 (Scurrent.ShapeType() != TopAbs_EDGE) {
+ Handle(Geom_BSplineCurve) newC;
+ if (Scurrent.ShapeType() == TopAbs_WIRE) {
+ TColgp_SequenceOfPnt PntSeq;
+ // collect points
+ for (Ex.Init(Scurrent, TopAbs_EDGE); Ex.More(); Ex.Next()) {
+ TopoDS_Edge E = TopoDS::Edge(Ex.Current());
+ if (BRep_Tool::Degenerated(E)) continue;
+ C = BRep_Tool::Curve(E, First, Last);
+ if( E.Orientation() == TopAbs_REVERSED ) {
+ C->Reverse();
+ }
+ Handle(Geom_TrimmedCurve) tc = Handle(Geom_TrimmedCurve)::DownCast(C);
+ while( !tc.IsNull() ) {
+ C = tc->BasisCurve();
+ tc = Handle(Geom_TrimmedCurve)::DownCast(C);
+ }
+ int nbp = 10;
+ if( C->IsKind(STANDARD_TYPE(Geom_Line)) ) {
+ nbp = 4;
+ }
+ else if( C->IsKind(STANDARD_TYPE(Geom_Circle)) ||
+ C->IsKind(STANDARD_TYPE(Geom_Ellipse)) ) {
+ nbp = (int)25*fabs(Last-First)/(2*PI);
+ }
+ else if( C->IsKind(STANDARD_TYPE(Geom_BezierCurve)) ) {
+ Handle(Geom_BezierCurve) C3d = Handle(Geom_BezierCurve)::DownCast(C);
+ nbp = C3d->NbPoles();
+ }
+ else if( C->IsKind(STANDARD_TYPE(Geom_BSplineCurve)) ) {
+ Handle(Geom_BSplineCurve) C3d = Handle(Geom_BSplineCurve)::DownCast(C);
+ nbp = C3d->NbPoles();
+ }
+ else {
+ }
+ if( nbp<4 ) nbp = 4;
+ double dp = (Last-First)/(nbp-1);
+ for(int i=1; i<nbp; i++) {
+ gp_Pnt P;
+ C->D0(First+dp*(i-1),P);
+ PntSeq.Append(P);
+ }
+ }
+ // add last point
+ gp_Pnt P;
+ C->D0(Last,P);
+ PntSeq.Append(P);
+ // create BSpline
+ if(PntSeq.Length()>1) {
+ TColgp_Array1OfPnt Pnts(1,PntSeq.Length());
+ // check orientation of wire
+ if( Scurrent.Orientation() == TopAbs_REVERSED ) {
+ for(int i=1; i<=PntSeq.Length(); i++) {
+ Pnts.SetValue(PntSeq.Length()-i+1,PntSeq.Value(i));
+ }
+ }
+ else {
+ for(int i=1; i<=PntSeq.Length(); i++) {
+ Pnts.SetValue(i,PntSeq.Value(i));
+ }
+ }
+ GeomAPI_PointsToBSpline PTB(Pnts);
+ newC = Handle(Geom_BSplineCurve)::DownCast(PTB.Curve());
+ // set periodic flag if curve is closed
+ //if( newC->IsClosed() ) {
+ // newC->SetPeriodic();
+ //}
+ // create edge
+ double fp = newC->FirstParameter();
+ double lp = newC->FirstParameter();
+ gp_Pnt PF,PL;
+ newC->D0(fp,PF);
+ newC->D0(lp,PL);
+ TopoDS_Vertex VF,VL;
+ B.MakeVertex(VF,PF,1.e-7);
+ B.MakeVertex(VL,PL,1.e-7);
+ TopoDS_Edge newE;
+ B.MakeEdge(newE,newC,1.e-7);
+ B.Add(newE,VF);
+ B.Add(newE,VL.Reversed());
+ Scurrent = newE;
+ }
+ }
+ if(newC.IsNull()) {
+ Standard_ConstructionError::Raise("The argument compound must contain only edges");
+ }
+ }
+ B.Add(aComp,Scurrent);
}
+ aShape = aComp;
if (!isApprox) {
// make filling as in old version of SALOME (before 4.1.1)
GeomFill_SectionGenerator Section;
Standard_Integer i = 0;
+ Handle(Geom_Curve) aLastC;
+ gp_Pnt PL1,PL2;
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);
- if (Scurrent.Orientation() == TopAbs_REVERSED)
- // Mantis isuue 0020659: consider the orientation of the edges
- C = new Geom_TrimmedCurve(C, Last, First);
- else
- C = new Geom_TrimmedCurve(C, First, Last);
+ //if (Scurrent.Orientation() == TopAbs_REVERSED)
+ // // Mantis isuue 0020659: consider the orientation of the edges
+ // C = new Geom_TrimmedCurve(C, Last, First);
+ //else
+ // C = new Geom_TrimmedCurve(C, First, Last);
+ C = new Geom_TrimmedCurve(C, First, Last);
+ gp_Pnt P1,P2;
+ C->D0(First,P1);
+ C->D0(Last,P2);
+
+ if( aMethod==1 && Scurrent.Orientation() == TopAbs_REVERSED ) {
+ C->Reverse();
+ }
+ else if( aMethod==2 ) {
+ if( i==0 ) {
+ PL1 = P1;
+ PL2 = P2;
+ }
+ else {
+ double d1 = PL1.Distance(P1) + PL2.Distance(P2);
+ double d2 = PL1.Distance(P2) + PL2.Distance(P1);
+ if(d2<d1) {
+ C->Reverse();
+ PL1 = P2;
+ PL2 = P1;
+ }
+ else {
+ PL1 = P1;
+ PL2 = P2;
+ }
+ }
+ }
+
Section.AddCurve(C);
i++;
}
