-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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
+// 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 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, or (at your option) any later version.
//
-// 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.
+// 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
+// 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
+// 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 <GEOM_Function.hxx>
+
+#include <Basics_OCCTVersion.hxx>
+
+#include <ShapeFix_Face.hxx>
+
#include <BRep_Tool.hxx>
#include <BRepAlgo.hxx>
+#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
#include <TopAbs.hxx>
+#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
+#include <TopoDS_Compound.hxx>
+#include <TopoDS_Edge.hxx>
#include <TopoDS_Shape.hxx>
-#include <TopExp_Explorer.hxx>
+#include <TopoDS_Vertex.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_BSplineCurve.hxx>
#include <Geom_BSplineSurface.hxx>
#include <GeomFill_Line.hxx>
#include <GeomFill_AppSurf.hxx>
#include <GeomFill_SectionGenerator.hxx>
+#include <GeomAPI_PointsToBSplineSurface.hxx>
+#include <GeomAPI_PointsToBSpline.hxx>
+
+#include <TColGeom_SequenceOfCurve.hxx>
+
+#include <TColgp_SequenceOfPnt.hxx>
+#include <TColgp_Array1OfPnt.hxx>
#include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <TColGeom_SequenceOfCurve.hxx>
-#include <ShapeFix_Face.hxx>
-#include <GeomAPI_PointsToBSplineSurface.hxx>
-#include <Geom_BSplineCurve.hxx>
+#include <Standard_ConstructionError.hxx>
//=======================================================================
//function : GetID
return aFillingDriver;
}
-
//=======================================================================
//function : GEOMImpl_FillingDriver
//purpose :
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aFunction.IsNull()) return 0;
-
if (aFunction->GetType() != BASIC_FILLING) return 0;
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_Integer maxdeg = IF.GetMaxDeg();
- Standard_Real tol3d = IF.GetTol2D();
- Standard_Real tol2d = IF.GetTol3D();
- Standard_Integer nbiter = IF.GetNbIter();
+ Standard_Real tol3d = IF.GetTol3D();
Standard_Boolean isApprox = IF.GetApprox();
if (mindeg > maxdeg) {
Standard_Real First, Last;
Handle(Geom_Curve) C;
+ TopoDS_Compound aComp;
+ BRep_Builder B;
+ B.MakeCompound(aComp);
+
+ // 1. Convert argument wires, if any, into BSpline edges
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) {
+ TopoDS_Edge NewEdge;
+ if (Scurrent.ShapeType() == TopAbs_WIRE)
+ {
+ const TopoDS_Wire& CurWire = TopoDS::Wire(Scurrent);
+ NewEdge = BRepAlgo::ConcatenateWireC0(CurWire);
+ }
+ if (NewEdge.IsNull()) {
+ Standard_ConstructionError::Raise("The argument compound must contain only edges");
+ }
+ Scurrent = NewEdge;
+ }
+ B.Add(aComp,Scurrent);
}
+ aShape = aComp;
+ // 2. The surface construction
if (!isApprox) {
// make filling as in old version of SALOME (before 4.1.1)
+
+ Standard_Real tol2d = IF.GetTol2D();
+ Standard_Integer nbiter = IF.GetNbIter();
+ Standard_Integer aMethod = IF.GetMethod();
+
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);
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++;
}
/* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
- Section.Perform(Precision::Confusion());
+ Section.Perform(Precision::PConfusion());
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);
- }
+ aShape = BRepBuilderAPI_MakeFace(GBS, Precision::Confusion());
+ }
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()) {
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()) {
+ if (TC.IsNull()) {
Handle(Geom_BSplineCurve) BC = Handle(Geom_BSplineCurve)::DownCast(C);
- if(!BC.IsNull()) {
+ if (!BC.IsNull()) {
MaxNbPoles = Max(MaxNbPoles,BC->NbPoles());
}
}
else {
Handle(Geom_BSplineCurve) BC = Handle(Geom_BSplineCurve)::DownCast(TC->BasisCurve());
- if(BC.IsNull()) {
+ if (BC.IsNull()) {
Handle(Geom_TrimmedCurve) TC1 = Handle(Geom_TrimmedCurve)::DownCast(TC->BasisCurve());
- if(!TC1.IsNull()) {
+ if (!TC1.IsNull()) {
BC = Handle(Geom_BSplineCurve)::DownCast(TC1->BasisCurve());
}
}
- if(!BC.IsNull()) {
+ if (!BC.IsNull()) {
MaxNbPoles = Max(MaxNbPoles,BC->NbPoles());
}
}
// 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 nbp = Max(21, 2*MaxNbPoles-1);
+
+ // commented for Mantis issue 0021541
+ //if (nbp > 101) nbp = 101;
+
+ TColgp_Array2OfPnt Points (1, nbc, 1, nbp);
int ic = 1;
- for(; ic<=nbc; ic++) {
+ 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);
- }
+ 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);
+ GeomAPI_PointsToBSplineSurface PTB (Points, mindeg, maxdeg, GeomAbs_C2, tol3d);
Handle(Geom_BSplineSurface) BS = PTB.Surface();
- BRepBuilderAPI_MakeFace BB(BS);
+ BRepBuilderAPI_MakeFace BB (BS, Precision::Confusion());
TopoDS_Face NewF = BB.Face();
- Handle(ShapeFix_Face) sff = new ShapeFix_Face(NewF);
+ 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))) {
- Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
+ Standard_ConstructionError::Raise("Algorithm has produced an invalid shape result");
return 0;
}
return 1;
}
+//================================================================================
+/*!
+ * \brief Returns a name of creation operation and names and values of creation parameters
+ */
+//================================================================================
-//=======================================================================
-//function : GEOMImpl_FillingDriver_Type_
-//purpose :
-//=======================================================================
-Standard_EXPORT Handle_Standard_Type& GEOMImpl_FillingDriver_Type_()
+bool GEOMImpl_FillingDriver::
+GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& theParams)
{
-
- static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
- if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
- static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
- if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
- static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-
- static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
- static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_FillingDriver",
- sizeof(GEOMImpl_FillingDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
-
- return _aType;
-}
-
-//=======================================================================
-//function : DownCast
-//purpose :
-//=======================================================================
-
-const Handle(GEOMImpl_FillingDriver) Handle(GEOMImpl_FillingDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
-{
- Handle(GEOMImpl_FillingDriver) _anOtherObject;
-
- if (!AnObject.IsNull()) {
- if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_FillingDriver))) {
- _anOtherObject = Handle(GEOMImpl_FillingDriver)((Handle(GEOMImpl_FillingDriver)&)AnObject);
- }
+ if (Label().IsNull()) return 0;
+ Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label());
+
+ GEOMImpl_IFilling aCI( function );
+ Standard_Integer aType = function->GetType();
+
+ theOperationName = "FILLING";
+
+ switch ( aType ) {
+ case BASIC_FILLING:
+ {
+ AddParam( theParams, "Input compound", aCI.GetShape() );
+ AddParam( theParams, "Method", aCI.GetMethod() );
+ const char* method[3] =
+ { "Standard", "Use edges orientation", "Correct edges orientation" };
+ if ( 0 <= aCI.GetMethod() && aCI.GetMethod() < 3 )
+ theParams[1] << " = " << method[ aCI.GetMethod() ];
+ AddParam( theParams, "Min deg", aCI.GetMinDeg() );
+ AddParam( theParams, "Max deg", aCI.GetMaxDeg() );
+ AddParam( theParams, "Nb. Iter", aCI.GetNbIter() );
+ AddParam( theParams, "Tol. 2D", aCI.GetTol2D() );
+ AddParam( theParams, "Tol. 3D", aCI.GetTol3D() );
+ AddParam( theParams, "Approximation", aCI.GetApprox() );
+ break;
+ }
+ default:
+ return false;
}
- return _anOtherObject ;
+ return true;
}
-
+IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FillingDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver);
