// Modified by skv - Fri Jul 8 11:21:38 2005 OCC9145
-#include <stdio.h>
-
-#include <BRepFill_OffsetWire.ixx>
-
+#include <Adaptor3d_Curve.hxx>
+#include <Adaptor2d_OffsetCurve.hxx>
+#include <Bisector_Bisec.hxx>
+#include <BRep_Builder.hxx>
+#include <BRep_CurveRepresentation.hxx>
+#include <BRep_GCurve.hxx>
+#include <BRep_TEdge.hxx>
+#include <BRep_Tool.hxx>
+#include <BRep_TVertex.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_Surface.hxx>
-
#include <BRepFill_DataMapOfNodeShape.hxx>
+#include <BRepFill_DataMapOfOrientedShapeListOfShape.hxx>
#include <BRepFill_DataMapOfShapeSequenceOfPnt.hxx>
-#include <BRepFill_DataMapOfShapeSequenceOfReal.hxx>
-#include <BRepFill_DataMapOfOrientedShapeListOfShape.hxx>
+#include <BRepFill_DataMapOfShapeSequenceOfReal.hxx>
+#include <BRepFill_OffsetWire.hxx>
#include <BRepFill_TrimEdgeTool.hxx>
#include <BRepLib.hxx>
-#include <BRepLib_MakeVertex.hxx>
+#include <BRepLib_MakeEdge.hxx>
#include <BRepLib_MakeFace.hxx>
+#include <BRepLib_MakeVertex.hxx>
#include <BRepLib_MakeWire.hxx>
-#include <BRepLib_MakeEdge.hxx>
+#include <BRepMAT2d_BisectingLocus.hxx>
+#include <BRepMAT2d_Explorer.hxx>
+#include <BRepMAT2d_LinkTopoBilo.hxx>
#include <BRepTools.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <BRep_TEdge.hxx>
-#include <BRep_CurveRepresentation.hxx>
-#include <BRep_GCurve.hxx>
+#include <BRepTools_Substitution.hxx>
#include <BRepTools_WireExplorer.hxx>
-#include <BRepMAT2d_Explorer.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dAdaptor_HCurve.hxx>
-#include <Adaptor3d_OffsetCurve.hxx>
-#include <Adaptor3d_Curve.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom2d_Curve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
#include <Geom2d_Circle.hxx>
+#include <Geom2d_Curve.hxx>
#include <Geom2d_Line.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2d_OffsetCurve.hxx>
-#include <GeomAPI.hxx>
-#include <Geom_TrimmedCurve.hxx>
+#include <Geom2d_TrimmedCurve.hxx>
+#include <Geom2dAdaptor_Curve.hxx>
+#include <Geom2dAdaptor_HCurve.hxx>
+#include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
+#include <Geom2dLProp_CLProps2d.hxx>
#include <Geom_Circle.hxx>
#include <Geom_Line.hxx>
#include <Geom_OffsetCurve.hxx>
+#include <Geom_Plane.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom_TrimmedCurve.hxx>
+#include <GeomAPI.hxx>
+#include <gp.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Dir2d.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Vec.hxx>
+#include <MAT2d_CutCurve.hxx>
#include <MAT_Arc.hxx>
-#include <MAT_Node.hxx>
#include <MAT_Graph.hxx>
-#include <MAT2d_CutCurve.hxx>
+#include <MAT_Node.hxx>
#include <Precision.hxx>
+#include <Standard_ConstructionError.hxx>
+#include <Standard_ErrorHandler.hxx>
+#include <Standard_NoSuchObject.hxx>
#include <Standard_NotImplemented.hxx>
+#include <TColgp_Array1OfPnt2d.hxx>
#include <TColgp_SequenceOfPnt.hxx>
-#include <TColStd_SequenceOfReal.hxx>
-#include <TopAbs.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array1OfReal.hxx>
+#include <TColStd_SequenceOfReal.hxx>
+#include <TopAbs.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
-#include <TopoDS_Wire.hxx>
#include <TopoDS_Compound.hxx>
+#include <TopoDS_Face.hxx>
#include <TopoDS_Iterator.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_DataMapOfShapeListOfShape.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Wire.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-#include <TopTools_SequenceOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapOfShapeSequenceOfShape.hxx>
-
-#include <gp.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Dir2d.hxx>
-
-#include <BRep_TVertex.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
-#include <Geom2d_BSplineCurve.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <BRepTools_Substitution.hxx>
-#include <BRepLib_MakeVertex.hxx>
-#include <Geom2dLProp_CLProps2d.hxx>
-#include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
-#include <Standard_ErrorHandler.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapIteratorOfMapOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <TopTools_SequenceOfShape.hxx>
+#include <stdio.h>
+#ifdef OCCT_DEBUG
+//#define DRAW
#ifdef DRAW
#include <Draw.hxx>
#include <DrawTrSurf.hxx>
#include <DrawTrSurf_Curve2d.hxx>
#include <DBRep.hxx>
+#include <Geom_Curve.hxx>
static Standard_Boolean AffichGeom = Standard_False;
static Standard_Boolean Affich2d = Standard_False;
static Standard_Boolean AffichEdge = Standard_False;
static Standard_Integer NbEDGES = 0;
static Standard_Integer NbBISSEC = 0;
#endif
+#endif
// Modified by Sergey KHROMOV - Thu Nov 16 17:24:39 2000 Begin
static void QuasiFleche(const Adaptor3d_Curve& C,
- const Standard_Real Deflection2,
- const Standard_Real Udeb,
- const gp_Pnt& Pdeb,
- const gp_Vec& Vdeb,
- const Standard_Real Ufin,
- const gp_Pnt& Pfin,
- const gp_Vec& Vfin,
- const Standard_Integer Nbmin,
- const Standard_Real Eps,
- TColStd_SequenceOfReal& Parameters,
- TColgp_SequenceOfPnt& Points);
+ const Standard_Real Deflection2,
+ const Standard_Real Udeb,
+ const gp_Pnt& Pdeb,
+ const gp_Vec& Vdeb,
+ const Standard_Real Ufin,
+ const gp_Pnt& Pfin,
+ const gp_Vec& Vfin,
+ const Standard_Integer Nbmin,
+ const Standard_Real Eps,
+ TColStd_SequenceOfReal& Parameters,
+ TColgp_SequenceOfPnt& Points);
static Standard_Boolean PerformCurve (TColStd_SequenceOfReal& Parameters,
- TColgp_SequenceOfPnt& Points,
- const Adaptor3d_Curve& C,
- const Standard_Real Deflection,
- const Standard_Real U1,
- const Standard_Real U2,
- const Standard_Real EPSILON,
- const Standard_Integer Nbmin);
+ TColgp_SequenceOfPnt& Points,
+ const Adaptor3d_Curve& C,
+ const Standard_Real Deflection,
+ const Standard_Real U1,
+ const Standard_Real U2,
+ const Standard_Real EPSILON,
+ const Standard_Integer Nbmin);
static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
- const BRepMAT2d_BisectingLocus& Locus,
- const BRepMAT2d_LinkTopoBilo& Link,
- TopTools_ListOfShape& BadEdges);
+ const BRepMAT2d_BisectingLocus& Locus,
+ const BRepMAT2d_LinkTopoBilo& Link,
+ TopTools_ListOfShape& BadEdges);
static Standard_Integer CutEdge (const TopoDS_Edge& E,
- const TopoDS_Face& F,
- Standard_Integer ForceCut,
- TopTools_ListOfShape& Cuts);
+ const TopoDS_Face& F,
+ Standard_Integer ForceCut,
+ TopTools_ListOfShape& Cuts);
static void CutCurve (const Handle(Geom2d_TrimmedCurve)& C,
- const Standard_Integer nbParts,
- TColGeom2d_SequenceOfCurve& theCurves);
+ const Standard_Integer nbParts,
+ TColGeom2d_SequenceOfCurve& theCurves);
// Modified by Sergey KHROMOV - Thu Nov 16 17:24:47 2000 End
static void EdgeVertices (const TopoDS_Edge& E,
- TopoDS_Vertex& V1,
- TopoDS_Vertex& V2)
+ TopoDS_Vertex& V1,
+ TopoDS_Vertex& V2)
{
if (E.Orientation() == TopAbs_REVERSED) {
TopExp::Vertices(E,V2,V1);
TopExp::Vertices(E,V1,V2);
}
}
-
static Standard_Boolean VertexFromNode
-(const Handle(MAT_Node)& aNode,
- const Standard_Real Offset,
- gp_Pnt2d& PN,
- BRepFill_DataMapOfNodeShape& MapNodeVertex,
- TopoDS_Vertex& VN);
+ (const Handle(MAT_Node)& aNode,
+ const Standard_Real Offset,
+ gp_Pnt2d& PN,
+ BRepFill_DataMapOfNodeShape& MapNodeVertex,
+ TopoDS_Vertex& VN);
static void StoreInMap (const TopoDS_Shape& V1,
- const TopoDS_Shape& V2,
- TopTools_IndexedDataMapOfShapeShape& MapVV);
+ const TopoDS_Shape& V2,
+ TopTools_IndexedDataMapOfShapeShape& MapVV);
static void TrimEdge (const TopoDS_Edge& CurrentEdge,
- const TopTools_ListOfShape& D,
+ const TopoDS_Shape& CurrentSpine,
+ const TopoDS_Face& AllSpine,
+ const TopTools_ListOfShape& D,
TopTools_SequenceOfShape& Sv,
TColStd_SequenceOfReal& MapverPar,
TopTools_SequenceOfShape& S,
TopTools_IndexedDataMapOfShapeShape& MapVV,
const Standard_Integer IndOfE);
+static Standard_Boolean IsInnerEdge(const TopoDS_Shape& ProE,
+ const TopoDS_Face& AllSpine,
+ Standard_Real& TrPar1,
+ Standard_Real& TrPar2);
+
static Standard_Boolean DoubleOrNotInside (const TopTools_ListOfShape& EC,
- const TopoDS_Vertex& V);
+ const TopoDS_Vertex& V);
static Standard_Boolean IsSmallClosedEdge(const TopoDS_Edge& anEdge,
- const TopoDS_Vertex& aVertex);
+ const TopoDS_Vertex& aVertex);
static void MakeCircle
-(const TopoDS_Edge& E,
- const TopoDS_Vertex& V,
- const TopoDS_Face& F,
- const Standard_Real Offset,
- BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
- const Handle(Geom_Plane)& RefPlane);
+ (const TopoDS_Edge& E,
+ const TopoDS_Vertex& V,
+ const TopoDS_Face& F,
+ const Standard_Real Offset,
+ BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
+ const Handle(Geom_Plane)& RefPlane);
static void MakeOffset
-(const TopoDS_Edge& E,
- const TopoDS_Face& F,
- const Standard_Real Offset,
- BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
- const Handle(Geom_Plane)& RefPlane,
- const Standard_Boolean IsOpenResult,
- const TopoDS_Vertex * Ends);
-
-
+ (const TopoDS_Edge& E,
+ const TopoDS_Face& F,
+ const Standard_Real Offset,
+ BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
+ const Handle(Geom_Plane)& RefPlane,
+ const Standard_Boolean IsOpenResult,
+ const GeomAbs_JoinType theJoinType,
+ const TopoDS_Vertex * Ends);
-//=======================================================================
-//function : CheckFace
-//purpose : Check if face contains an edge with C0 continuity
-//=======================================================================
-//
-static void CheckFace(const TopoDS_Face& theFace)
- {
- TopExp_Explorer ex(theFace,TopAbs_EDGE);
- for(; ex.More(); ex.Next())
- {
- TopoDS_Edge anEdge=TopoDS::Edge(ex.Current());
- Standard_Real f,l;
- const Handle(Geom2d_Curve) C = BRep_Tool::CurveOnSurface(anEdge,theFace,f,l);
- if (C->Continuity() == GeomAbs_C0)
- Standard_ConstructionError::Raise("Initial shape contains an edge with C0 continuity");
- }
- }
+Standard_Boolean CheckSmallParamOnEdge(const TopoDS_Edge& anEdge);
//=======================================================================
//function : KPartCircle
//=======================================================================
static Standard_Boolean KPartCircle
-(const TopoDS_Face& mySpine,
- const Standard_Real myOffset,
- const Standard_Real Alt,
- TopoDS_Shape& myShape,
- BRepFill_IndexedDataMapOfOrientedShapeListOfShape& myMap,
- Standard_Boolean& myIsDone)
+ (const TopoDS_Face& mySpine,
+ const Standard_Real myOffset,
+ const Standard_Boolean IsOpenResult,
+ const Standard_Real Alt,
+ TopoDS_Shape& myShape,
+ BRepFill_IndexedDataMapOfOrientedShapeListOfShape& myMap,
+ Standard_Boolean& myIsDone)
{
- // The only contour which is a closed circle
- TopExp_Explorer exp(mySpine,TopAbs_EDGE);
- Standard_Integer NbEdges = 0;
- TopoDS_Edge E;
-
- for (; exp.More(); exp.Next()) {
- NbEdges++;
- E = TopoDS::Edge(exp.Current());
- if (NbEdges > 1) return Standard_False;
+ TopoDS_Edge E;
+ for (TopExp_Explorer anEdgeIter (mySpine, TopAbs_EDGE); anEdgeIter.More(); anEdgeIter.Next())
+ {
+ if (!E.IsNull())
+ {
+ return Standard_False;
+ }
+ E = TopoDS::Edge (anEdgeIter.Current());
+ }
+ if (E.IsNull())
+ {
+ return Standard_False;
}
Standard_Real f,l;
TopLoc_Location L;
Handle(Geom_Curve) C = BRep_Tool::Curve(E,L,f,l);
+ if (C.IsNull())
+ {
+ return Standard_False;
+ }
if (C->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) {
Handle(Geom_TrimmedCurve) Ct = Handle(Geom_TrimmedCurve)::DownCast(C);
C = Ct->BasisCurve();
}
- TopoDS_Vertex V1,V2;
- TopExp::Vertices(E,V1,V2);
- if (!V1.IsSame(V2) || //open result or closed circle
- C->IsKind(STANDARD_TYPE(Geom_Circle)))
+ if ((C->IsKind(STANDARD_TYPE(Geom_Circle)) && BRep_Tool::IsClosed(E)) || //closed circle
+ IsOpenResult)
{
Standard_Real anOffset = myOffset;
- if (E.Orientation() == TopAbs_REVERSED) anOffset *= -1;
Handle(Geom2d_Curve) aPCurve = BRep_Tool::CurveOnSurface(E, mySpine, f, l);
Handle(Geom2dAdaptor_HCurve) AHC = new Geom2dAdaptor_HCurve(aPCurve, f, l);
Handle(Geom2d_Curve) OC;
if (AHC->GetType() == GeomAbs_Line)
{
- Adaptor3d_OffsetCurve Off(AHC,anOffset);
+ if (E.Orientation() == TopAbs_FORWARD)
+ anOffset *= -1;
+ Adaptor2d_OffsetCurve Off(AHC, anOffset);
OC = new Geom2d_Line(Off.Line());
}
else if (AHC->GetType() == GeomAbs_Circle)
{
+ if (E.Orientation() == TopAbs_FORWARD)
+ anOffset *= -1;
gp_Circ2d theCirc = AHC->Circle();
- if (anOffset < 0. || Abs(anOffset) < theCirc.Radius())
- OC = new Geom2d_Circle (theCirc.Position(), theCirc.Radius() - anOffset);
+ if (anOffset > 0. || Abs(anOffset) < theCirc.Radius())
+ OC = new Geom2d_Circle (theCirc.Position(), theCirc.Radius() + anOffset);
+ else
+ {
+ myIsDone = Standard_False;
+ return Standard_False;
+ }
}
else
{
+ if (E.Orientation() == TopAbs_FORWARD)
+ anOffset *= -1;
Handle(Geom2d_TrimmedCurve) G2dT = new Geom2d_TrimmedCurve(aPCurve, f, l);
- OC = new Geom2d_OffsetCurve( G2dT, anOffset);
+ OC = new Geom2d_OffsetCurve(G2dT, anOffset);
}
Handle(Geom_Surface) aSurf = BRep_Tool::Surface(mySpine);
Handle(Geom_Plane) aPlane = Handle(Geom_Plane)::DownCast(aSurf);
myShape.Orientation(E.Orientation());
myShape.Location(L);
- if (Alt != 0.) {
+ if (fabs(Alt) > gp::Resolution()) {
BRepAdaptor_Surface S(mySpine,0);
gp_Ax1 Nor = S.Plane().Axis();
gp_Trsf T;
//=======================================================================
BRepFill_OffsetWire::BRepFill_OffsetWire(const TopoDS_Face& Spine,
- const GeomAbs_JoinType Join,
- const Standard_Boolean IsOpenResult)
+ const GeomAbs_JoinType Join,
+ const Standard_Boolean IsOpenResult)
{
Init(Spine,Join,IsOpenResult);
}
//=======================================================================
void BRepFill_OffsetWire::Init(const TopoDS_Face& Spine,
- const GeomAbs_JoinType Join,
- const Standard_Boolean IsOpenResult)
+ const GeomAbs_JoinType Join,
+ const Standard_Boolean IsOpenResult)
{
myIsDone = Standard_False;
TopoDS_Shape aLocalShape = Spine.Oriented(TopAbs_FORWARD);
mySpine = TopoDS::Face(aLocalShape);
-// mySpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
+ // mySpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
myJoinType = Join;
myIsOpenResult = IsOpenResult;
-
- CheckFace(mySpine);
myMap.Clear();
myMapSpine.Clear();
//------------------------------------------------------------------
// cut the spine for bissectors.
//------------------------------------------------------------------
-// Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 Begin
+ // Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 Begin
static BRepMAT2d_Explorer Exp;
Exp.Perform(mySpine);
-// TopoDS_Face anOldSpine = mySpine;
+ // TopoDS_Face anOldSpine = mySpine;
mySpine = TopoDS::Face(Exp.ModifiedShape(mySpine));
PrepareSpine ();
-// Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 End
+ // Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 End
TopoDS_Shape aShape;
BRepFill_IndexedDataMapOfOrientedShapeListOfShape aMap;
Standard_Boolean Done;
- if (KPartCircle(myWorkSpine,1.,0.,aShape,aMap,Done)) return;
-
+ if (KPartCircle(myWorkSpine,1.,myIsOpenResult,0.,aShape,aMap,Done)) return;
+
//-----------------------------------------------------
// Calculate the map of bissectors to the left.
// and Links Topology -> base elements of the map.
//-----------------------------------------------------
-// Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 Begin
-// static BRepMAT2d_Explorer Exp;
-// Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 End
+ // Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 Begin
+ // static BRepMAT2d_Explorer Exp;
+ // Modified by Sergey KHROMOV - Tue Nov 26 17:39:03 2002 End
Exp.Perform(myWorkSpine);
myBilo.Compute(Exp, 1 ,MAT_Left, myJoinType, myIsOpenResult);
- myLink.Perform(Exp, myBilo);
+ myLink.Perform(Exp,myBilo);
}
//=======================================================================
const TopTools_ListOfShape& BRepFill_OffsetWire::GeneratedShapes
-(const TopoDS_Shape& SpineShape)
+ (const TopoDS_Shape& SpineShape)
{
if (!myCallGen) {
if (!myMapSpine.IsEmpty()) {
}
if ( !it.Value().IsSame(it.Key())) {
myMap.ChangeFromKey(it.Value()).Append(myMap.ChangeFromKey(it.Key()));
- //myMap.UnBind(it.Key());
- TopoDS_Shape LastShape = myMap.FindKey(myMap.Extent());
- TopTools_ListOfShape LastList;
- LastList.Append(myMap(myMap.Extent()));
- myMap.RemoveLast();
- if (myMap.FindIndex(it.Key()) != 0)
- myMap.Substitute(myMap.FindIndex(it.Key()), LastShape, LastList);
+ myMap.RemoveKey(it.Key());
}
}
if (myMap.Contains(it.Key().Reversed())) {
}
if ( !it.Value().IsSame(it.Key())) {
myMap.ChangeFromKey(it.Value().Reversed()).Append(myMap.ChangeFromKey(it.Key().Reversed()));
- //myMap.UnBind(it.Key().Reversed());
- TopoDS_Shape LastShape = myMap.FindKey(myMap.Extent());
- TopTools_ListOfShape LastList;
- LastList.Append(myMap(myMap.Extent()));
- myMap.RemoveLast();
- if (myMap.FindIndex(it.Key().Reversed()) != 0)
- myMap.Substitute(myMap.FindIndex(it.Key().Reversed()), LastShape, LastList);
+ myMap.RemoveKey(it.Key().Reversed());
}
}
}
}
myCallGen = Standard_True;
}
-
+
if (myMap.Contains(SpineShape)) {
return myMap.FindFromKey(SpineShape);
}
//=======================================================================
void BRepFill_OffsetWire::Perform (const Standard_Real Offset,
- const Standard_Real Alt)
+ const Standard_Real Alt)
{
// Modified by skv - Fri Jul 8 11:21:38 2005 OCC9145 Begin
try
{
OCC_CATCH_SIGNALS
myCallGen = Standard_False;
- if (KPartCircle(myWorkSpine,Offset,Alt,myShape,myMap,myIsDone)) return;
+ if (KPartCircle(myWorkSpine,Offset,myIsOpenResult,Alt,myShape,myMap,myIsDone)) return;
TopoDS_Face oldWorkSpain = myWorkSpine;
if(!BadEdges.IsEmpty())
{
// Modification of myWorkSpine;
- //cout << "Modification of myWorkSpine : " << BadEdges.Extent() << endl;
+ //std::cout << "Modification of myWorkSpine : " << BadEdges.Extent() << std::endl;
BRepTools_Substitution aSubst;
TopTools_ListIteratorOfListOfShape it(BadEdges);
TopTools_ListOfShape aL;
GeomAdaptor_Curve AC(G3d,f,l);
PerformCurve(Parameters, Points, AC, aDefl, f,
- l, Precision::Confusion(), 2);
+ l, Precision::Confusion(), 2);
Standard_Integer NPnts = Points.Length();
if(NPnts > 2)
{
- //cout << NPnts << " points " << endl;
+ //std::cout << NPnts << " points " << std::endl;
TopoDS_Vertex FV = Vf;
TopoDS_Vertex LV;
TopoDS_Edge newE;
}
else
{
- //cout << " 2 points " << endl;
+ //std::cout << " 2 points " << std::endl;
TopoDS_Edge newE = BRepLib_MakeEdge(Vf, Vl);
aL.Append(newE);
}
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmap( wwmap );
for (; itmap.More(); itmap.Next())
aSubst.Substitute( itmap.Key(), itmap.Value() );
-
+
aSubst.Build(myWorkSpine);
-
+
if(aSubst.IsCopied(myWorkSpine)) {
myWorkSpine = TopoDS::Face(aSubst.Copy(myWorkSpine).First());
PerformWithBiLo(myWorkSpine,Offset,myBilo,myLink,myJoinType,Alt);
}
}
- catch (Standard_Failure)//Every exception was caught.
- {
- myShape.Nullify();
- myIsDone = Standard_False;
+ catch (Standard_Failure const& anException) {
#ifdef OCCT_DEBUG
- cout<<"An exception was caught in BRepFill_OffsetWire::Perform : ";
- Standard_Failure::Caught()->Print(cout);
- cout<<endl;
+ std::cout<<"An exception was caught in BRepFill_OffsetWire::Perform : ";
+ anException.Print(std::cout);
+ std::cout<<std::endl;
#endif
+ (void)anException;
+ myShape.Nullify();
+ myIsDone = Standard_False;
return;
}
if (!myIsOpenResult)
{
TopExp_Explorer anExp(myShape, TopAbs_WIRE);
-
+
for (; anExp.More(); anExp.Next()) {
const TopoDS_Shape &aWire = anExp.Current();
-
+
if (!aWire.Closed()) {
myShape.Nullify();
myIsDone = Standard_False;
- Standard_ConstructionError::Raise("Offset wire is not closed.");
+ throw Standard_ConstructionError("Offset wire is not closed.");
}
}
}
//=======================================================================
void Compute (const TopoDS_Face& Spine,
- TopoDS_Shape& aShape,
- BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
- const Standard_Real Alt)
+ TopoDS_Shape& aShape,
+ BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
+ const Standard_Real Alt)
{
BRep_Builder B;
B.MakeCompound(TopoDS::Compound(aShape));
const TopoDS_Wire& CurW = TopoDS::Wire(exp.Current());
TopoDS_Shape aLocalShape = CurW.Moved(L);
TopoDS_Wire NewW = TopoDS::Wire(aLocalShape);
-// TopoDS_Wire NewW = TopoDS::Wire(CurW.Moved(L));
+ // TopoDS_Wire NewW = TopoDS::Wire(CurW.Moved(L));
B.Add(aShape,NewW);
// update Map.
TopoDS_Iterator it1( CurW);
//=======================================================================
void BRepFill_OffsetWire::PerformWithBiLo
-(const TopoDS_Face& Spine,
- const Standard_Real Offset,
- const BRepMAT2d_BisectingLocus& Locus,
- BRepMAT2d_LinkTopoBilo& Link,
- const GeomAbs_JoinType Join,
- const Standard_Real Alt)
+ (const TopoDS_Face& Spine,
+ const Standard_Real Offset,
+ const BRepMAT2d_BisectingLocus& Locus,
+ BRepMAT2d_LinkTopoBilo& Link,
+ const GeomAbs_JoinType Join,
+ const Standard_Real Alt)
{
myIsDone = Standard_False;
- TopoDS_Shape aLocalShape = Spine.Oriented(TopAbs_FORWARD);
- myWorkSpine = TopoDS::Face(aLocalShape);
-// myWorkSpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
+ TopoDS_Shape aLocalShapeWork = Spine.Oriented(TopAbs_FORWARD);
+ myWorkSpine = TopoDS::Face(aLocalShapeWork);
+ // myWorkSpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
myJoinType = Join;
myOffset = Offset ;
myShape.Nullify();
if (mySpine.IsNull()) {
TopoDS_Shape aLocalShape = Spine.Oriented(TopAbs_FORWARD);
mySpine = TopoDS::Face(aLocalShape);
-// mySpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
-}
+ // mySpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
+ }
myMap.Clear();
if ( Abs(myOffset) < Precision::Confusion()) {
//********************************
// Calculate for a non null offset
//********************************
- if (KPartCircle(myWorkSpine,Offset,Alt,myShape,myMap,myIsDone))
+ if (KPartCircle(myWorkSpine,Offset,myIsOpenResult,Alt,myShape,myMap,myIsDone))
return;
BRep_Builder myBuilder;
- myBuilder.MakeCompound(TopoDS::Compound(myShape));
-
+
//---------------------------------------------------------------------
// MapNodeVertex : associate to each node of the map (key1) and to
// each element of the profile (key2) a vertex (item).
TopTools_ListOfShape EmptyList;
TColStd_SequenceOfReal EmptySeqOfReal;
- Standard_Real ALT = Alt;
Handle(Geom_Plane) RefPlane =
Handle(Geom_Plane)::DownCast(BRep_Tool::Surface(myWorkSpine));
- if ( myWorkSpine.Orientation() == TopAbs_REVERSED) ALT = -Alt;
- RefPlane = Handle(Geom_Plane)::DownCast
- (RefPlane->Translated( ALT * gp_Vec(RefPlane->Axis().Direction() )));
+ if (fabs(Alt) > gp::Resolution()) {
+ Standard_Real anAlt = Alt;
+ if ( myWorkSpine.Orientation() == TopAbs_REVERSED) anAlt = -Alt;
+ RefPlane = Handle(Geom_Plane)::DownCast
+ (RefPlane->Translated( anAlt * gp_Vec(RefPlane->Axis().Direction() )));
+ }
//---------------------------------------------------------------
// Construction of Circles and OffsetCurves
theWire = TopoDS::Wire(iter.Value());
TopExp::Vertices(theWire, Ends[0], Ends[1]);
}
-
+
+ if (Locus.NumberOfContours() == 0)
+ {
+ return;
+ }
+
for (Standard_Integer ic = 1; ic <= Locus.NumberOfContours(); ic++) {
TopoDS_Shape PEE = Link.GeneratingShape(Locus.BasicElt(ic,Locus.NumberOfElts(ic)));
TopoDS_Shape& PE = PEE ;
myWorkSpine,myOffset,myMap,RefPlane);
}
else {
- MakeOffset (TopoDS::Edge(SE),myWorkSpine,myOffset,myMap,RefPlane,
- myIsOpenResult, Ends);
- PE = SE;
+ MakeOffset (TopoDS::Edge(SE),myWorkSpine,myOffset,myMap,RefPlane,
+ myIsOpenResult, myJoinType, Ends);
+ PE = SE;
}
}
}
+ //Remove possible hanging arcs on vertices
+ if (myIsOpenResult && myJoinType == GeomAbs_Arc)
+ {
+ if (!myMap.IsEmpty() &&
+ myMap.FindKey(1).ShapeType() == TopAbs_VERTEX)
+ {
+ myMap.RemoveFromIndex(1);
+ }
+ if (!myMap.IsEmpty() &&
+ myMap.FindKey(myMap.Extent()).ShapeType() == TopAbs_VERTEX)
+ myMap.RemoveLast();
+ }
+#ifdef OCCT_DEBUG
#ifdef DRAW
if (AffichEdge) {
- cout << " End Construction of geometric primitives "<<endl;
+ std::cout << " End Construction of geometric primitives "<<std::endl;
}
#endif
+#endif
//---------------------------------------------------
CurrentArc = Locus.Graph()->Arc(i);
Bisector_Bisec Bisec = Locus.GeomBis(CurrentArc,Reverse);
-
+#ifdef OCCT_DEBUG
#ifdef DRAW
- if ( AffichGeom) {
- char name[256];
- sprintf(name,"BISSEC_%d",NbBISSEC++);
- DrawTrSurf::Set(name,Bisec.Value());
- }
+
+ if ( AffichGeom) {
+ char name[256];
+ sprintf(name,"BISSEC_%d",NbBISSEC++);
+ DrawTrSurf::Set(name,Bisec.Value());
+ }
+#endif
#endif
//-------------------------------------------------------------------
TopTools_SequenceOfShape Vertices;
TColgp_SequenceOfPnt Params;
-
+
TopTools_DataMapOfShapeSequenceOfShape MapSeqVer;
BRepFill_DataMapOfShapeSequenceOfPnt MapSeqPar;
Node1 = CurrentArc->FirstNode();
Node2 = CurrentArc->SecondNode();
}
-
+
Standard_Boolean StartOnEdge = 0, EndOnEdge = 0;
-
+
if (!Node1->Infinite()) {
gp_Pnt2d aLocalPnt2d = Locus.GeomElt(Node1);
StartOnEdge = VertexFromNode(Node1, myOffset, aLocalPnt2d ,MapNodeVertex,VS);
-// StartOnEdge = VertexFromNode(Node1, myOffset, Locus.GeomElt(Node1),
-// MapNodeVertex,VS);
+ // StartOnEdge = VertexFromNode(Node1, myOffset, Locus.GeomElt(Node1),
+ // MapNodeVertex,VS);
}
if (!Node2->Infinite()) {
gp_Pnt2d aLocalPnt2d = Locus.GeomElt(Node2) ;
EndOnEdge = VertexFromNode(Node2, myOffset, aLocalPnt2d ,MapNodeVertex,VE);
-// EndOnEdge = VertexFromNode(Node2, myOffset, Locus.GeomElt(Node2),
-// MapNodeVertex,VE);
+ // EndOnEdge = VertexFromNode(Node2, myOffset, Locus.GeomElt(Node2),
+ // MapNodeVertex,VE);
}
+ if (myJoinType == GeomAbs_Intersection)
+ StartOnEdge = EndOnEdge = 0;
+
//---------------------------------------------
// Construction of geometries.
//---------------------------------------------
BRepFill_TrimEdgeTool Trim (Bisec,
- Locus.GeomElt(CurrentArc->FirstElement()),
- Locus.GeomElt(CurrentArc->SecondElement()),
- myOffset);
+ Locus.GeomElt(CurrentArc->FirstElement()),
+ Locus.GeomElt(CurrentArc->SecondElement()),
+ myOffset);
//-----------------------------------------------------------
// Construction of vertices on edges parallel to the spine.
//-----------------------------------------------------------
- Trim.IntersectWith(E [0], E [1], Params);
+ Trim.IntersectWith(E[0], E[1], S[0], S[1], Ends[0], Ends[1],
+ myJoinType, myIsOpenResult, Params);
for (Standard_Integer s = 1; s <= Params.Length(); s++) {
TopoDS_Vertex VC;
Standard_Boolean Start = 1;
Trim.AddOrConfuse(Start, E[0], E[1], Params);
if (Params.Length() == Vertices.Length())
- Vertices.SetValue(1,VS);
+ Vertices.SetValue(1,VS);
else
- // the point was not found by IntersectWith
- Vertices.Prepend(VS);
+ // the point was not found by IntersectWith
+ Vertices.Prepend(VS);
}
if (EndOnEdge) {
Standard_Boolean Start = 0;
Trim.AddOrConfuse(Start, E[0], E[1], Params);
if (Params.Length() == Vertices.Length())
- Vertices.SetValue(Params.Length(),VE);
+ Vertices.SetValue(Params.Length(),VE);
else
- // the point was not found by IntersectWith
- Vertices.Append(VE);
+ // the point was not found by IntersectWith
+ Vertices.Append(VE);
}
//------------------------------------------------------------
UpdateDetromp (Detromp, S[0], S[1], Vertices, Params,
- Bisec, StartOnEdge, EndOnEdge, Trim);
+ Bisec, StartOnEdge, EndOnEdge, Trim);
//----------------------------------------------
// Storage of vertices on parallel edges.
// fill MapBis and MapVerPar.
//----------------------------------------------
if (!Vertices.IsEmpty()) {
for (k = 0; k <= 1; k++) {
- if (!MapBis.IsBound(E[k])) {
- MapBis .Bind(E[k],EmptySeq);
- MapVerPar.Bind(E[k],EmptySeqOfReal);
- }
- for (Standard_Integer ii = 1; ii <= Vertices.Length(); ii++) {
- MapBis (E[k]).Append(Vertices.Value(ii));
- if (k == 0) MapVerPar (E[k]).Append(Params.Value(ii).Y());
- else MapVerPar (E[k]).Append(Params.Value(ii).Z());
- }
+ if (!MapBis.IsBound(E[k])) {
+ MapBis .Bind(E[k],EmptySeq);
+ MapVerPar.Bind(E[k],EmptySeqOfReal);
+ }
+ for (Standard_Integer ii = 1; ii <= Vertices.Length(); ii++) {
+ MapBis (E[k]).Append(Vertices.Value(ii));
+ if (k == 0) MapVerPar (E[k]).Append(Params.Value(ii).Y());
+ else MapVerPar (E[k]).Append(Params.Value(ii).Z());
+ }
}
}
else {
// if myoffset is < distance of nodes the parallel can be valid.
//-------------------------------------------------------------
for (k = 0; k <= 1; k++) {
- if (!MapBis.IsBound(E[k])) {
- if (Node1->Distance() > myOffset && Node2->Distance() > myOffset) {
- MapBis .Bind(E[k],EmptySeq);
- MapVerPar.Bind(E[k],EmptySeqOfReal);
- }
- }
+ if (!MapBis.IsBound(E[k])) {
+ if (Node1->Distance() > myOffset && Node2->Distance() > myOffset) {
+ MapBis .Bind(E[k],EmptySeq);
+ MapVerPar.Bind(E[k],EmptySeqOfReal);
+ }
+ }
}
}
}
-
+
+#ifdef OCCT_DEBUG
#ifdef DRAW
if (AffichEdge) {
- cout << " End Construction of vertices on offsets"<<endl;
+ std::cout << " End Construction of vertices on offsets"<<std::endl;
}
+#endif
#endif
//----------------------------------
myMap(j).Clear();
if (MapBis.IsBound(CurrentEdge)) {
- TopTools_SequenceOfShape S;
+ TopTools_SequenceOfShape aSeqOfShape;
if (!MapBis(CurrentEdge).IsEmpty()) {
Standard_Integer IndOfE = 0;
if (myIsOpenResult)
else if (j == myMap.Extent())
IndOfE = -1;
}
- TrimEdge (CurrentEdge,
- Detromp (CurrentSpine),
- MapBis (CurrentEdge) ,
- MapVerPar(CurrentEdge) ,
- S, MapVV, IndOfE);
- for ( k = 1; k <= S.Length(); k++) {
- myMap(j).Append(S.Value(k));
- }
+ TrimEdge (CurrentEdge,
+ CurrentSpine,
+ mySpine,
+ Detromp (CurrentSpine),
+ MapBis (CurrentEdge) ,
+ MapVerPar(CurrentEdge) ,
+ aSeqOfShape, MapVV, IndOfE);
+ for ( k = 1; k <= aSeqOfShape.Length(); k++) {
+ myMap(j).Append(aSeqOfShape.Value(k));
+ }
}
else {
- //-----------------
- // Complete circles
- //-----------------
- myMap(j).Append(CurrentEdge);
+ //-----------------
+ // Complete circles
+ //-----------------
+ myMap(j).Append(CurrentEdge);
}
}
}
-
+
Standard_Integer ind;
for (ind = 1; ind <= MapVV.Extent(); ind++)
+ {
+ TopoDS_Vertex OldV = TopoDS::Vertex(MapVV.FindKey(ind));
+ TopoDS_Vertex NewV = TopoDS::Vertex(MapVV(ind));
+ gp_Pnt P1 = BRep_Tool::Pnt(OldV);
+ gp_Pnt P2 = BRep_Tool::Pnt(NewV);
+ myBuilder.UpdateVertex(NewV, P1.Distance(P2));
+ TopTools_ListOfShape LV;
+ LV.Append( NewV.Oriented(TopAbs_FORWARD) );
+ BRepTools_Substitution aSubst;
+ aSubst.Substitute( OldV, LV );
+ for (j = 1; j <= myMap.Extent(); j++)
{
- TopoDS_Vertex OldV = TopoDS::Vertex(MapVV.FindKey(ind));
- TopoDS_Vertex NewV = TopoDS::Vertex(MapVV(ind));
- gp_Pnt P1 = BRep_Tool::Pnt(OldV);
- gp_Pnt P2 = BRep_Tool::Pnt(NewV);
- myBuilder.UpdateVertex(NewV, P1.Distance(P2));
- TopTools_ListOfShape LV;
- LV.Append( NewV.Oriented(TopAbs_FORWARD) );
- BRepTools_Substitution aSubst;
- aSubst.Substitute( OldV, LV );
- for (j = 1; j <= myMap.Extent(); j++)
- {
- TopTools_ListIteratorOfListOfShape itl(myMap(j));
- for (; itl.More(); itl.Next())
- {
- aSubst.Build(itl.Value());
- if (aSubst.IsCopied(itl.Value()))
- {
- const TopTools_ListOfShape& listSh = aSubst.Copy(itl.Value());
- TopAbs_Orientation SaveOr = itl.Value().Orientation();
- itl.Value() = listSh.First();
- itl.Value().Orientation(SaveOr);
- }
- }
- }
+ TopTools_ListIteratorOfListOfShape itl(myMap(j));
+ for (; itl.More(); itl.Next())
+ {
+ aSubst.Build(itl.Value());
+ if (aSubst.IsCopied(itl.Value()))
+ {
+ const TopTools_ListOfShape& listSh = aSubst.Copy(itl.Value());
+ TopAbs_Orientation SaveOr = itl.Value().Orientation();
+ itl.Value() = listSh.First();
+ itl.Value().Orientation(SaveOr);
+ }
+ }
}
+ }
//----------------------------------
// Construction of offset wires.
MapVertex.Clear();
TopExp_Explorer Explo( myShape, TopAbs_EDGE );
for (; Explo.More(); Explo.Next())
+ {
+ TopoDS_Edge anEdge = TopoDS::Edge( Explo.Current() );
+ TopoDS_Vertex V1, V2;
+ TopExp::Vertices(anEdge, V1, V2 );
+ Handle(BRep_TVertex)& TV1 = *((Handle(BRep_TVertex)*) &(V1).TShape());
+ Handle(BRep_TVertex)& TV2 = *((Handle(BRep_TVertex)*) &(V2).TShape());
+
+ TopLoc_Location loc;
+ Standard_Real f, l;
+ Handle( Geom_Curve ) theCurve = BRep_Tool::Curve(anEdge, loc, f, l );
+ theCurve = Handle( Geom_Curve )::DownCast( theCurve->Copy() );
+ theCurve->Transform( loc.Transformation() );
+ gp_Pnt f3d = theCurve->Value( f );
+ gp_Pnt l3d = theCurve->Value( l );
+
+ Standard_Real dist1, dist2;
+ dist1 = f3d.Distance( TV1->Pnt() );
+ dist2 = l3d.Distance( TV2->Pnt() );
+ if (! MapVertex.Contains( V1 ))
{
- TopoDS_Edge E = TopoDS::Edge( Explo.Current() );
- TopoDS_Vertex V1, V2;
- TopExp::Vertices( E, V1, V2 );
- Handle(BRep_TVertex)& TV1 = *((Handle(BRep_TVertex)*) &(V1).TShape());
- Handle(BRep_TVertex)& TV2 = *((Handle(BRep_TVertex)*) &(V2).TShape());
- TopLoc_Location loc;
- Standard_Real f, l;
- Handle( Geom_Curve ) theCurve = BRep_Tool::Curve( E, loc, f, l );
- theCurve = Handle( Geom_Curve )::DownCast( theCurve->Copy() );
- theCurve->Transform( loc.Transformation() );
- gp_Pnt f3d = theCurve->Value( f );
- gp_Pnt l3d = theCurve->Value( l );
-
- Standard_Real dist1, dist2;
- dist1 = f3d.Distance( TV1->Pnt() );
- dist2 = l3d.Distance( TV2->Pnt() );
- if (! MapVertex.Contains( V1 ))
- {
- TV1->Pnt( f3d );
- MapVertex.Add( V1 );
- }
- else
- TV1->UpdateTolerance( 1.5*dist1 );
- if (! MapVertex.Contains( V2 ))
- {
- TV2->Pnt( l3d );
- MapVertex.Add( V2 );
- }
- else
- TV2->UpdateTolerance( 1.5*dist2 );
+ TV1->Pnt( f3d );
+ MapVertex.Add( V1 );
}
+ else
+ TV1->UpdateTolerance( 1.5*dist1 );
+ if (! MapVertex.Contains( V2 ))
+ {
+ TV2->Pnt( l3d );
+ MapVertex.Add( V2 );
+ }
+ else
+ TV2->UpdateTolerance( 1.5*dist2 );
+ }
- FixHoles();
+ if (!myIsOpenResult)
+ FixHoles();
myIsDone = Standard_True;
}
//=======================================================================
BRepFill_IndexedDataMapOfOrientedShapeListOfShape&
-BRepFill_OffsetWire::Generated()
+ BRepFill_OffsetWire::Generated()
{
return myMap;
}
TopoDS_Wire NW;
B.MakeWire (NW);
-// Modified by Sergey KHROMOV - Thu Nov 16 17:29:55 2000 Begin
+ // Modified by Sergey KHROMOV - Thu Nov 16 17:29:55 2000 Begin
Standard_Integer ForcedCut = 0;
Standard_Integer nbResEdges = -1;
TopTools_IndexedMapOfShape EdgeMap;
if (nbEdges == 1 && !myIsOpenResult) //in case of open wire there's no need to do it
ForcedCut = 2;
-// Modified by Sergey KHROMOV - Thu Nov 16 17:29:48 2000 End
+ // Modified by Sergey KHROMOV - Thu Nov 16 17:29:48 2000 End
for (TopoDS_Iterator IteW(IteF.Value()); IteW.More(); IteW.Next()) {
// Cut
TopoDS_Shape aLocalShape = E.Oriented(TopAbs_FORWARD);
-// Modified by Sergey KHROMOV - Thu Nov 16 17:29:29 2000 Begin
+ // Modified by Sergey KHROMOV - Thu Nov 16 17:29:29 2000 Begin
if (nbEdges == 2 && nbResEdges == 0)
- ForcedCut = 1;
-// Modified by Sergey KHROMOV - Thu Nov 16 17:29:33 2000 End
+ ForcedCut = 1;
+ // Modified by Sergey KHROMOV - Thu Nov 16 17:29:33 2000 End
nbResEdges = CutEdge (TopoDS::Edge(aLocalShape), mySpine, ForcedCut, Cuts);
if (Cuts.IsEmpty()) {
- B.Add(NW,E);
- myMapSpine.Bind(E,E);
+ B.Add(NW,E);
+ myMapSpine.Bind(E,E);
}
else {
- for (IteCuts.Initialize(Cuts); IteCuts.More(); IteCuts.Next()) {
- TopoDS_Edge NE = TopoDS::Edge(IteCuts.Value());
- NE.Orientation(E.Orientation());
- B.Add(NW,NE);
- myMapSpine.Bind(NE,E);
- EdgeVertices(NE,V1,V2);
- if (!myMapSpine.IsBound(V1)) myMapSpine.Bind(V1,E);
- if (!myMapSpine.IsBound(V2)) myMapSpine.Bind(V2,E);
- }
+ for (IteCuts.Initialize(Cuts); IteCuts.More(); IteCuts.Next()) {
+ TopoDS_Edge NE = TopoDS::Edge(IteCuts.Value());
+ NE.Orientation(E.Orientation());
+ B.Add(NW,NE);
+ myMapSpine.Bind(NE,E);
+ EdgeVertices(NE,V1,V2);
+ if (!myMapSpine.IsBound(V1)) myMapSpine.Bind(V1,E);
+ if (!myMapSpine.IsBound(V2)) myMapSpine.Bind(V2,E);
+ }
}
}
-// Modified by Sergey KHROMOV - Thu Mar 7 09:17:41 2002 Begin
+ // Modified by Sergey KHROMOV - Thu Mar 7 09:17:41 2002 Begin
TopoDS_Vertex aV1;
TopoDS_Vertex aV2;
TopExp::Vertices(NW, aV1, aV2);
NW.Closed(aV1.IsSame(aV2));
-// Modified by Sergey KHROMOV - Thu Mar 7 09:17:43 2002 End
+
+ // Modified by Sergey KHROMOV - Thu Mar 7 09:17:43 2002 End
B.Add(myWorkSpine, NW);
}
+#ifdef OCCT_DEBUG
#ifdef DRAW
if ( AffichEdge) {
DBRep::Set("WS",myWorkSpine);
+ DBRep::Set("MS",mySpine);
+ BRepTools::Write(myWorkSpine, "WS");
+ BRepTools::Write(mySpine, "MS");
}
#endif
+#endif
}
const Standard_Boolean EOnE,
const BRepFill_TrimEdgeTool& Trim) const
{
- if (myJoinType == GeomAbs_Intersection &&
- Vertices.Length() == 1 &&
- !EOnE)
+ Standard_Integer ii = 1;
+
+ if (myJoinType == GeomAbs_Intersection)
{
- TopTools_IndexedMapOfShape Vmap1, Vmap2;
- TopExp::MapShapes(Shape1, TopAbs_VERTEX, Vmap1);
- TopExp::MapShapes(Shape2, TopAbs_VERTEX, Vmap2);
- Standard_Boolean Adjacent = Standard_False;
- for (Standard_Integer i = 1; i <= Vmap1.Extent(); i++)
- for (Standard_Integer j = 1; j <= Vmap2.Extent(); j++)
- if (Vmap1(i).IsSame(Vmap2(j)))
- {
- Adjacent = Standard_True;
- break;
- }
- if (Adjacent)
+ for (; ii <= Vertices.Length(); ii++)
{
- Detromp(Shape1).Append(Vertices.First());
- Detromp(Shape2).Append(Vertices.First());
- return;
+ const TopoDS_Vertex& aVertex = TopoDS::Vertex(Vertices.Value(ii));
+ Detromp(Shape1).Append(aVertex);
+ Detromp(Shape2).Append(aVertex);
}
}
-
- Standard_Integer ii = 1;
- Standard_Real U1,U2;
- TopoDS_Vertex V1,V2;
-
- Handle(Geom2d_Curve) Bis = Bisec.Value();
-
- U1 = Bis->FirstParameter();
-
- if (SOnE) {
- // the first point of the bissectrice is on the offset
- V1 = TopoDS::Vertex(Vertices.Value(ii));
- ii++;
- }
-
- while (ii <= Vertices.Length()) {
- U2 = Params.Value(ii).X();
- V2 = TopoDS::Vertex(Vertices.Value(ii));
+ else //myJoinType == GeomAbs_Arc
+ {
+ Standard_Real U1,U2;
+ TopoDS_Vertex V1,V2;
+
+ const Handle(Geom2d_Curve)& Bis = Bisec.Value();
+ Standard_Boolean ForceAdd = Standard_False;
+ Handle(Geom2d_TrimmedCurve) aTC = Handle(Geom2d_TrimmedCurve)::DownCast(Bis);
+ if(!aTC.IsNull() && aTC->BasisCurve()->IsPeriodic())
+ {
+ gp_Pnt2d Pf = Bis->Value(Bis->FirstParameter());
+ gp_Pnt2d Pl = Bis->Value(Bis->LastParameter());
+ ForceAdd = Pf.Distance(Pl) <= Precision::Confusion();
+ }
- gp_Pnt2d P = Bis->Value((U2 + U1)*0.5);
- if (!Trim.IsInside(P)) {
- if (!V1.IsNull()) {
- Detromp(Shape1).Append(V1);
- Detromp(Shape2).Append(V1);
- }
- Detromp(Shape1).Append(V2);
- Detromp(Shape2).Append(V2);
- }
- U1 = U2;
- V1 = V2;
- ii ++;
- }
-
- // test medium point between the last parameter and the end of the bissectrice.
- U2 = Bis->LastParameter();
- if (!EOnE) {
- if (!Precision::IsInfinite(U2)) {
- gp_Pnt2d P = Bis->Value((U2 + U1)*0.5);
- if (!Trim.IsInside(P)) {
- if (!V1.IsNull()) {
- Detromp(Shape1).Append(V1);
- Detromp(Shape2).Append(V1);
- }
- }
+ U1 = Bis->FirstParameter();
+
+ if (SOnE) {
+ // the first point of the bissectrice is on the offset
+ V1 = TopoDS::Vertex(Vertices.Value(ii));
+ ii++;
}
- else {
- if (!V1.IsNull()) {
- Detromp(Shape1).Append(V1);
- Detromp(Shape2).Append(V1);
+
+ while (ii <= Vertices.Length()) {
+ U2 = Params.Value(ii).X();
+ V2 = TopoDS::Vertex(Vertices.Value(ii));
+
+ gp_Pnt2d P = Bis->Value((U2 + U1)*0.5);
+ if (!Trim.IsInside(P) || ForceAdd) {
+ if (!V1.IsNull()) {
+ Detromp(Shape1).Append(V1);
+ Detromp(Shape2).Append(V1);
+ }
+ Detromp(Shape1).Append(V2);
+ Detromp(Shape2).Append(V2);
}
+ U1 = U2;
+ V1 = V2;
+ ii ++;
}
- }
+
+ // test medium point between the last parameter and the end of the bissectrice.
+ U2 = Bis->LastParameter();
+ if (!EOnE) {
+ if (!Precision::IsInfinite(U2)) {
+ gp_Pnt2d P = Bis->Value((U2 + U1)*0.5);
+ if (!Trim.IsInside(P) || ForceAdd) {
+ if (!V1.IsNull()) {
+ Detromp(Shape1).Append(V1);
+ Detromp(Shape2).Append(V1);
+ }
+ }
+ }
+ else {
+ if (!V1.IsNull()) {
+ Detromp(Shape1).Append(V1);
+ Detromp(Shape2).Append(V1);
+ }
+ }
+ }
+ //else if(myJoinType != GeomAbs_Arc)
+ //{
+ // if (!V1.IsNull()) {
+ // Detromp(Shape1).Append(V1);
+ // Detromp(Shape2).Append(V1);
+ // }
+ //}
+ } //end of else (myJoinType==GeomAbs_Arc)
}
//=======================================================================
const TopoDS_Edge& E = TopoDS::Edge(itl.Value());
TopExp::Vertices (E,V1,V2);
if (V1.IsSame(V2) && IsSmallClosedEdge(E, V1))
- continue; //remove small closed edges
+ continue; //remove small closed edges
+ if (!CheckSmallParamOnEdge(E))
+ continue;
if (!MVE.Contains(V1)) {
- TopTools_ListOfShape empty;
- MVE.Add(V1,empty);
+ TopTools_ListOfShape empty;
+ MVE.Add(V1,empty);
}
MVE.ChangeFromKey(V1).Append(E);
if (!MVE.Contains(V2)) {
- TopTools_ListOfShape empty;
- MVE.Add(V2,empty);
+ TopTools_ListOfShape empty;
+ MVE.Add(V2,empty);
}
MVE.ChangeFromKey(V2).Append(E);
}
//--------------------------------------
BRep_Builder B;
-// Standard_Integer NbEdges;
-// Standard_Boolean NewWire = Standard_True;
-// Standard_Boolean AddEdge = Standard_False;
+
+ // Standard_Integer NbEdges;
+ // Standard_Boolean NewWire = Standard_True;
+ // Standard_Boolean AddEdge = Standard_False;
TopoDS_Wire NW;
Standard_Boolean End;
CV = VF = TopoDS::Vertex(MVE.FindKey(i));
CE = TopoDS::Edge(MVE(i).First());
End = Standard_False;
- MVE.ChangeFromKey(CV).RemoveFirst();
+ MVE.ChangeFromKey(CV).RemoveFirst();
+
+ if (myIsOpenResult && MVE.FindFromKey(CV).IsEmpty())
+ {
+ MVE.RemoveKey(CV);
+ }
+
-// Modified by Sergey KHROMOV - Thu Mar 14 11:29:59 2002 Begin
+ // Modified by Sergey KHROMOV - Thu Mar 14 11:29:59 2002 Begin
Standard_Boolean isClosed = Standard_False;
-// Modified by Sergey KHROMOV - Thu Mar 14 11:30:00 2002 End
+
+ // Modified by Sergey KHROMOV - Thu Mar 14 11:30:00 2002 End
while(!End) {
//-------------------------------
B.Add (NW,CE);
if (VF.IsSame(CV) || !MVE.Contains(CV)) {
-// Modified by Sergey KHROMOV - Thu Mar 14 11:30:14 2002 Begin
- isClosed = VF.IsSame(CV);
-// Modified by Sergey KHROMOV - Thu Mar 14 11:30:15 2002 End
- End = Standard_True;
- //MVE.UnBind(VF);
- TopoDS_Shape LastShape = MVE.FindKey(MVE.Extent());
- TopTools_ListOfShape LastList;
- LastList.Append(MVE(MVE.Extent()));
- MVE.RemoveLast();
- if (MVE.FindIndex(VF) != 0)
- MVE.Substitute(MVE.FindIndex(VF), LastShape, LastList);
+ // Modified by Sergey KHROMOV - Thu Mar 14 11:30:14 2002 Begin
+ isClosed = VF.IsSame(CV);
+ // Modified by Sergey KHROMOV - Thu Mar 14 11:30:15 2002 End
+ End = Standard_True;
+ MVE.RemoveKey(VF);
}
if (!End) {
- if (MVE.FindFromKey(CV).Extent() > 2) {
- //cout <<"vertex on more that 2 edges in a face."<<endl;
- }
- for ( itl.Initialize(MVE.FindFromKey(CV)); itl.More(); itl.Next()) {
- if (itl.Value().IsSame(CE)) {
- MVE.ChangeFromKey(CV).Remove(itl);
- break;
- }
- }
- if (!MVE.FindFromKey(CV).IsEmpty()) {
- CE = TopoDS::Edge(MVE.FindFromKey(CV).First());
- MVE.ChangeFromKey(CV).RemoveFirst();
- }
- if (MVE.FindFromKey(CV).IsEmpty())
+ if (MVE.FindFromKey(CV).Extent() > 2) {
+ //std::cout <<"vertex on more that 2 edges in a face."<<std::endl;
+ }
+ for ( itl.Initialize(MVE.FindFromKey(CV)); itl.More(); itl.Next()) {
+ if (itl.Value().IsSame(CE)) {
+ MVE.ChangeFromKey(CV).Remove(itl);
+ break;
+ }
+ }
+ if (!MVE.FindFromKey(CV).IsEmpty()) {
+ CE = TopoDS::Edge(MVE.FindFromKey(CV).First());
+ MVE.ChangeFromKey(CV).RemoveFirst();
+ }
+ else if (myIsOpenResult)//CV was a vertex with one edge
+ End = Standard_True;
+
+ if (MVE.FindFromKey(CV).IsEmpty())
{
- //MVE.UnBind(CV);
- TopoDS_Shape LastShape = MVE.FindKey(MVE.Extent());
- TopTools_ListOfShape LastList;
- LastList.Append(MVE(MVE.Extent()));
- MVE.RemoveLast();
- if (MVE.FindIndex(CV) != 0)
- MVE.Substitute(MVE.FindIndex(CV), LastShape, LastList);
+ MVE.RemoveKey(CV);
}
}
}
-// Modified by Sergey KHROMOV - Thu Mar 14 11:29:31 2002 Begin
-// NW.Closed(Standard_True);
+ // Modified by Sergey KHROMOV - Thu Mar 14 11:29:31 2002 Begin
+ // NW.Closed(Standard_True);
NW.Closed(isClosed);
-// Modified by Sergey KHROMOV - Thu Mar 14 11:29:37 2002 End
+ // Modified by Sergey KHROMOV - Thu Mar 14 11:29:37 2002 End
TheWires.Append(NW);
}
TopTools_SequenceOfShape ClosedWires, UnclosedWires, IsolatedWires;
Standard_Real MaxTol = 0.;
- Standard_Integer i;
BRep_Builder BB;
TopExp_Explorer Explo( mySpine, TopAbs_VERTEX );
TopoDS_Vertex Vf, Vl;
TopExp::Vertices( Base, Vf, Vl );
if(Vf.IsNull() || Vl.IsNull())
- Standard_Failure::Raise("BRepFill_OffsetWire::FixHoles(): Wrong wire.");
+ {
+ throw Standard_Failure("BRepFill_OffsetWire::FixHoles(): Wrong wire.");
+ }
gp_Pnt Pf, Pl;
Pf = BRep_Tool::Pnt(Vf);
Pl = BRep_Tool::Pnt(Vl);
Standard_Real DistF = RealLast(), DistL = RealLast();
- Standard_Integer IndexF = 1, IndexL = 1;
+ Standard_Integer IndexF = 0, IndexL = 0;
Standard_Boolean IsFirstF = Standard_False, IsFirstL = Standard_False;
for (Standard_Integer i = 2; i <= UnclosedWires.Length(); i++)
{
TopExp::Vertices( aWire, V1, V2 );
if(V1.IsNull() || V2.IsNull())
- Standard_Failure::Raise("BRepFill_OffsetWire::FixHoles(): Wrong wire.");
+ {
+ throw Standard_Failure("BRepFill_OffsetWire::FixHoles(): Wrong wire.");
+ }
gp_Pnt P1, P2;
P1 = BRep_Tool::Pnt(V1);
IsFirstL = Standard_False;
}
}
+ if (DistF > MaxTol)
+ IndexF = 0;
+ if (DistL > MaxTol)
+ IndexL = 0;
TopoDS_Wire theWire;
TopoDS_Edge theEdge;
TopoDS_Vertex theVertex;
{
TopoDS_Compound R;
BB.MakeCompound( R );
+ Standard_Integer i;
for (i = 1; i <= ClosedWires.Length(); i++)
BB.Add( R, ClosedWires(i) );
for (i = 1; i <= IsolatedWires.Length(); i++)
// belong to the first and the last parts respectively.
//=======================================================================
Standard_Integer CutEdge (const TopoDS_Edge& E,
- const TopoDS_Face& F,
- Standard_Integer ForceCut,
- TopTools_ListOfShape& Cuts)
+ const TopoDS_Face& F,
+ Standard_Integer ForceCut,
+ TopTools_ListOfShape& Cuts)
{
Cuts.Clear();
MAT2d_CutCurve Cuter;
Standard_Real f,l;
Handle(Geom2d_Curve) C2d;
Handle(Geom2d_TrimmedCurve) CT2d;
-// Modified by Sergey KHROMOV - Wed Mar 6 17:36:25 2002 Begin
+ // Modified by Sergey KHROMOV - Wed Mar 6 17:36:25 2002 Begin
Standard_Real aTol = BRep_Tool::Tolerance(E);
Handle(Geom_Curve) aC;
-// Modified by Sergey KHROMOV - Wed Mar 6 17:36:25 2002 End
+ // Modified by Sergey KHROMOV - Wed Mar 6 17:36:25 2002 End
TopoDS_Vertex V1,V2,VF,VL;
TopExp::Vertices (E,V1,V2);
BRep_Builder B;
C2d = BRep_Tool::CurveOnSurface (E,F,f,l);
-// Modified by Sergey KHROMOV - Wed Mar 6 17:36:54 2002 Begin
+ // Modified by Sergey KHROMOV - Wed Mar 6 17:36:54 2002 Begin
aC = BRep_Tool::Curve(E,f,l);
-// Modified by Sergey KHROMOV - Wed Mar 6 17:36:54 2002 End
+ // Modified by Sergey KHROMOV - Wed Mar 6 17:36:54 2002 End
CT2d = new Geom2d_TrimmedCurve(C2d,f,l);
//if (E.Orientation() == TopAbs_REVERSED) CT2d->Reverse();
if (CT2d->BasisCurve()->IsKind(STANDARD_TYPE(Geom2d_Circle)) &&
- ( Abs(f-l) >= M_PI) ) {
- return 0;
+ ( Abs(f-l) >= M_PI) ) {
+ return 0;
}
//-------------------------
//-------------------------
Cuter.Perform(CT2d);
-// Modified by Sergey KHROMOV - Thu Nov 16 17:28:29 2000 Begin
+ // Modified by Sergey KHROMOV - Thu Nov 16 17:28:29 2000 Begin
if (ForceCut == 0) {
if (Cuter.UnModified()) {
- //-----------------------------
- // edge not modified => return.
- //-----------------------------
+ //-----------------------------
+ // edge not modified => return.
+ //-----------------------------
return 0;
} else {
for (Standard_Integer k = 1; k <= Cuter.NbCurves(); k++)
- theCurves.Append(Cuter.Value(k));
+ theCurves.Append(Cuter.Value(k));
}
} else if (ForceCut == 1) {
if (Cuter.UnModified()) {
CutCurve (CT2d, 2, theCurves);
} else {
for (Standard_Integer k = 1; k <= Cuter.NbCurves(); k++)
- theCurves.Append(Cuter.Value(k));
+
+ theCurves.Append(Cuter.Value(k));
}
} else if (ForceCut == 2) {
if (Cuter.UnModified()) {
CutCurve (CT2d, 3, theCurves);
} else {
if (Cuter.NbCurves() == 2) {
- Handle(Geom2d_TrimmedCurve)CC = Cuter.Value(1);
-
- if (CC->LastParameter() > (l+f)/2.) {
- CutCurve (CC, 2, theCurves);
- theCurves.Append(Cuter.Value(2));
- } else {
- theCurves.Append(CC);
- CutCurve (Cuter.Value(2), 2, theCurves);
- }
+
+ Handle(Geom2d_TrimmedCurve)CC = Cuter.Value(1);
+
+ if (CC->LastParameter() > (l+f)/2.) {
+ CutCurve (CC, 2, theCurves);
+ theCurves.Append(Cuter.Value(2));
+ } else {
+ theCurves.Append(CC);
+ CutCurve (Cuter.Value(2), 2, theCurves);
+ }
} else {
- for (Standard_Integer k = 1; k <= Cuter.NbCurves(); k++)
- theCurves.Append(Cuter.Value(k));
+ for (Standard_Integer k = 1; k <= Cuter.NbCurves(); k++)
+ theCurves.Append(Cuter.Value(k));
}
}
}
-// Modified by Sergey KHROMOV - Thu Nov 16 17:28:37 2000 End
+
+ // Modified by Sergey KHROMOV - Thu Nov 16 17:28:37 2000 End
//--------------------------------------
// Creation of cut edges.
if (k == theCurves.Length()) {VL = V2;}
else {
-// Modified by Sergey KHROMOV - Wed Mar 6 17:38:02 2002 Begin
+ // Modified by Sergey KHROMOV - Wed Mar 6 17:38:02 2002 Begin
gp_Pnt P = aC->Value(CC->LastParameter());
VL = BRepLib_MakeVertex(P);
B.UpdateVertex(VL, aTol);
-// Modified by Sergey KHROMOV - Wed Mar 6 17:38:05 2002 End
+ // Modified by Sergey KHROMOV - Wed Mar 6 17:38:05 2002 End
}
TopoDS_Shape aLocalShape = E.EmptyCopied();
TopoDS_Edge NE = TopoDS::Edge(aLocalShape);
-// TopoDS_Edge NE = TopoDS::Edge(E.EmptyCopied());
+ // TopoDS_Edge NE = TopoDS::Edge(E.EmptyCopied());
NE.Orientation(TopAbs_FORWARD);
B.Add (NE,VF.Oriented(TopAbs_FORWARD));
B.Add (NE,VL.Oriented(TopAbs_REVERSED));
//=======================================================================
void CutCurve (const Handle(Geom2d_TrimmedCurve)& C,
- const Standard_Integer nbParts,
- TColGeom2d_SequenceOfCurve& theCurves)
+ const Standard_Integer nbParts,
+ TColGeom2d_SequenceOfCurve& theCurves)
{
Handle(Geom2d_TrimmedCurve) TrimC;
Standard_Real UF,UL,UC;
if (UC - UF > PTol && PC.Distance(PF) > Tol) {
if ( UL - UC < PTol || PL.Distance(PC) < Tol)
- continue;
+ continue;
TrimC = new Geom2d_TrimmedCurve(C,UF,UC);
theCurves.Append(TrimC);
//=======================================================================
void MakeCircle (const TopoDS_Edge& E,
- const TopoDS_Vertex& V,
- const TopoDS_Face& F,
- const Standard_Real Offset,
- BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
- const Handle(Geom_Plane)& RefPlane)
+ const TopoDS_Vertex& V,
+ const TopoDS_Face& F,
+ const Standard_Real Offset,
+ BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
+ const Handle(Geom_Plane)& RefPlane)
{
// evaluate the Axis of the Circle.
Standard_Real f,l;
LL.Append(OE);
Map.Add(V,LL);
+#ifdef OCCT_DEBUG
#ifdef DRAW
if ( AffichGeom && !OE.IsNull()) {
char name[256];
DBRep::Set(name,OE);
}
#endif
+#endif
}
//=======================================================================
//=======================================================================
void MakeOffset (const TopoDS_Edge& E,
- const TopoDS_Face& F,
- const Standard_Real Offset,
- BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
- const Handle(Geom_Plane)& RefPlane,
- const Standard_Boolean IsOpenResult,
- const TopoDS_Vertex * Ends)
+ const TopoDS_Face& F,
+ const Standard_Real Offset,
+ BRepFill_IndexedDataMapOfOrientedShapeListOfShape& Map,
+ const Handle(Geom_Plane)& RefPlane,
+ const Standard_Boolean IsOpenResult,
+ const GeomAbs_JoinType theJoinType,
+ const TopoDS_Vertex * Ends)
{
Standard_Real f,l;
Standard_Real anOffset = Offset;
- if (E.Orientation() == TopAbs_REVERSED) anOffset *= -1;
+ if (E.Orientation() == TopAbs_FORWARD) anOffset *= -1;
Handle(Geom2d_Curve) G2d = BRep_Tool::CurveOnSurface(E,F,f,l);
Handle(Geom2d_Curve) G2dOC;
TopoDS_Vertex V1, V2;
TopExp::Vertices(E, V1, V2);
if (V1.IsSame(Ends[0]) ||
- V1.IsSame(Ends[1]))
+ V1.IsSame(Ends[1]))
ToExtendFirstPar = Standard_False;
if (V2.IsSame(Ends[0]) ||
- V2.IsSame(Ends[1]))
+ V2.IsSame(Ends[1]))
ToExtendLastPar = Standard_False;
}
gp_Dir2d Xd = axes.XDirection();
gp_Dir2d Yd = axes.YDirection();
Standard_Real Crossed = Xd.X()*Yd.Y()-Xd.Y()*Yd.X();
- Standard_Real Signe = ( Crossed > 0.) ? 1. : -1.;
+ Standard_Real Signe = ( Crossed > 0.) ? -1. : 1.;
if (anOffset*Signe < AC.Circle().Radius() - Precision::Confusion()) {
Handle(Geom2dAdaptor_HCurve) AHC =
- new Geom2dAdaptor_HCurve(G2d);
- Adaptor3d_OffsetCurve Off(AHC,-anOffset);
- Handle(Geom2d_Circle) CC = new Geom2d_Circle(Off.Circle());
+ new Geom2dAdaptor_HCurve(G2d);
+ Adaptor2d_OffsetCurve Off(AHC, anOffset);
+ Handle(Geom2d_Circle) CC = new Geom2d_Circle(Off.Circle());
Standard_Real Delta = 2*M_PI - l + f;
+ if (theJoinType == GeomAbs_Arc)
+ {
if (ToExtendFirstPar)
f -= 0.2*Delta;
if (ToExtendLastPar)
l += 0.2*Delta;
-
+ }
+ else //GeomAbs_Intersection
+ {
+ if (ToExtendFirstPar && ToExtendLastPar)
+ {
+ Standard_Real old_l = l;
+ f = old_l + Delta/2.;
+ l = f + 2*M_PI;
+ }
+ else if (ToExtendFirstPar)
+ {
+ f = l;
+ l = f + 2*M_PI;
+ }
+ else if (ToExtendLastPar)
+ {
+ l = f + 2*M_PI;
+ }
+ }
G2dOC = new Geom2d_TrimmedCurve(CC,f,l);
}
}
else if (AC.GetType() == GeomAbs_Line) {
Handle(Geom2dAdaptor_HCurve) AHC =
new Geom2dAdaptor_HCurve(G2d);
- Adaptor3d_OffsetCurve Off(AHC,anOffset);
+ Adaptor2d_OffsetCurve Off(AHC, anOffset);
Handle(Geom2d_Line) CC = new Geom2d_Line(Off.Line());
Standard_Real Delta = (l - f);
if (ToExtendFirstPar)
+ {
+ if (theJoinType == GeomAbs_Arc)
f -= Delta;
+ else //GeomAbs_Intersection
+ f = -Precision::Infinite();
+ }
if (ToExtendLastPar)
+ {
+ if (theJoinType == GeomAbs_Arc)
l += Delta;
+ else //GeomAbs_Intersection
+ l = Precision::Infinite();
+ }
G2dOC = new Geom2d_TrimmedCurve(CC,f,l);
}
else {
- anOffset = -anOffset;
Handle(Geom2d_TrimmedCurve) G2dT = new Geom2d_TrimmedCurve(G2d,f,l);
G2dOC = new Geom2d_OffsetCurve( G2dT, anOffset);
LL.Append(OE);
Map.Add(E,LL);
+#ifdef OCCT_DEBUG
#ifdef DRAW
if (AffichGeom && !OE.IsNull()) {
char name[256];
sprintf(name,"OFFSET_%d",++NbOFFSET);
DBRep::Set(name,OE);
- Standard_Real ii = 0;
+ //Standard_Real ii = 0;
}
#endif
-
+#endif
+
}
}
//=======================================================================
Standard_Boolean VertexFromNode (const Handle(MAT_Node)& aNode,
- const Standard_Real Offset,
- gp_Pnt2d& PN,
- BRepFill_DataMapOfNodeShape& MapNodeVertex,
- TopoDS_Vertex& VN)
+ const Standard_Real Offset,
+ gp_Pnt2d& PN,
+ BRepFill_DataMapOfNodeShape& MapNodeVertex,
+ TopoDS_Vertex& VN)
{
Standard_Boolean Status;
Standard_Real Tol = Precision::Confusion();
//=======================================================================
void StoreInMap (const TopoDS_Shape& V1,
- const TopoDS_Shape& V2,
- TopTools_IndexedDataMapOfShapeShape& MapVV)
+ const TopoDS_Shape& V2,
+ TopTools_IndexedDataMapOfShapeShape& MapVV)
{
TopoDS_Shape OldV = V1, NewV = V2;
Standard_Integer i;
//=======================================================================
void TrimEdge (const TopoDS_Edge& E,
+ const TopoDS_Shape& ProE,
+ const TopoDS_Face& AllSpine,
const TopTools_ListOfShape& Detromp,
TopTools_SequenceOfShape& TheVer,
TColStd_SequenceOfReal& ThePar,
Change = Standard_False;
for (Standard_Integer i = 1; i < ThePar.Length(); i++) {
if (ThePar.Value(i) > ThePar.Value(i+1)) {
- ThePar.Exchange(i,i+1);
- TheVer.Exchange(i,i+1);
- Change = Standard_True;
+ ThePar.Exchange(i,i+1);
+ TheVer.Exchange(i,i+1);
+ Change = Standard_True;
}
}
}
if (!BRep_Tool::Degenerated(E)) {
for (Standard_Integer k = 1; k <= TheVer.Length(); k ++) {
if ( DoubleOrNotInside (Detromp,
- TopoDS::Vertex(TheVer.Value(k)))) {
- TheVer.Remove(k);
- ThePar.Remove(k);
- k--;
+ TopoDS::Vertex(TheVer.Value(k)))) {
+ TheVer.Remove(k);
+ ThePar.Remove(k);
+ k--;
}
}
}
// otherwise preserve only one of its representations.
//----------------------------------------------------------
if (!BRep_Tool::Degenerated(E)) {
+ Standard_Real aParTol = 2.0 * Precision::PConfusion();
for (Standard_Integer k = 1; k < TheVer.Length(); k ++) {
if (TheVer.Value(k).IsSame(TheVer.Value(k+1)) ||
- Abs(ThePar.Value(k)-ThePar.Value(k+1)) <= Precision::PConfusion()) {
-
- if(k+1 == TheVer.Length()) {
- StoreInMap(TheVer(k), TheVer(k+1), MapVV);
- TheVer.Remove(k);
- ThePar.Remove(k);
- }
- else {
- StoreInMap(TheVer(k+1), TheVer(k), MapVV);
- TheVer.Remove(k+1);
- ThePar.Remove(k+1);
- }
- /*
- if ( DoubleOrNotInside (Detromp,
- TopoDS::Vertex(TheVer.Value(k)))) {
- TheVer.Remove(k);
- ThePar.Remove(k);
- k--;
- }
- */
- k--;
+ Abs(ThePar.Value(k)-ThePar.Value(k+1)) <= aParTol) {
+
+ if(k+1 == TheVer.Length()) {
+ StoreInMap(TheVer(k), TheVer(k+1), MapVV);
+ TheVer.Remove(k);
+ ThePar.Remove(k);
+ }
+ else {
+ StoreInMap(TheVer(k+1), TheVer(k), MapVV);
+ TheVer.Remove(k+1);
+ ThePar.Remove(k+1);
+ }
+ /*
+ if ( DoubleOrNotInside (Detromp,
+ TopoDS::Vertex(TheVer.Value(k)))) {
+ TheVer.Remove(k);
+ ThePar.Remove(k);
+ k--;
+ }
+ */
+ k--;
}
}
}
TopoDS_Vertex V1, V2;
TopExp::Vertices(E, V1, V2);
Standard_Real fpar, lpar;
- BRep_Tool::Range(E, fpar, lpar);
+ Handle(Geom_Surface) aPlane;
+ TopLoc_Location aLoc;
+ Handle(Geom2d_Curve) PCurve;
+ BRep_Tool::CurveOnSurface(E, PCurve, aPlane, aLoc, fpar, lpar);
+ //BRep_Tool::Range(E, fpar, lpar);
+
+ Standard_Real TrPar1, TrPar2;
+ Standard_Boolean ToTrimAsOrigin = IsInnerEdge(ProE, AllSpine, TrPar1, TrPar2);
+
if (IndOfE == 1) //first edge of open wire
{
if (NewEdge.Orientation() == TopAbs_FORWARD)
{
+ if (ToTrimAsOrigin)
+ {
+ fpar = TrPar1;
+ gp_Pnt2d TrPnt2d = PCurve->Value(fpar);
+ gp_Pnt TrPnt(TrPnt2d.X(), TrPnt2d.Y(), 0.);
+ V1 = BRepLib_MakeVertex(TrPnt);
+ }
TheBuilder.Add(NewEdge, V1.Oriented(TopAbs_FORWARD));
TheBuilder.Add(NewEdge, TheVer.First().Oriented(TopAbs_REVERSED));
TheBuilder.Range(NewEdge, fpar, ThePar.First());
}
else
{
- //TheBuilder.Add(NewEdge, V1.Oriented(TopAbs_REVERSED));
- //TheBuilder.Add(NewEdge, TheVer.First().Oriented(TopAbs_FORWARD));
+ if (ToTrimAsOrigin)
+ {
+ lpar = TrPar2;
+ gp_Pnt2d TrPnt2d = PCurve->Value(lpar);
+ gp_Pnt TrPnt(TrPnt2d.X(), TrPnt2d.Y(), 0.);
+ V2 = BRepLib_MakeVertex(TrPnt);
+ }
TheBuilder.Add(NewEdge, TheVer.First().Oriented(TopAbs_REVERSED));
TheBuilder.Add(NewEdge, V2.Oriented(TopAbs_FORWARD));
TheBuilder.Range(NewEdge, ThePar.First(), lpar);
{
if (NewEdge.Orientation() == TopAbs_FORWARD)
{
+ if (ToTrimAsOrigin)
+ {
+ lpar = TrPar2;
+ gp_Pnt2d TrPnt2d = PCurve->Value(lpar);
+ gp_Pnt TrPnt(TrPnt2d.X(), TrPnt2d.Y(), 0.);
+ V2 = BRepLib_MakeVertex(TrPnt);
+ }
TheBuilder.Add(NewEdge, TheVer.First().Oriented(TopAbs_FORWARD));
TheBuilder.Add(NewEdge, V2.Oriented(TopAbs_REVERSED));
TheBuilder.Range(NewEdge, ThePar.First(), lpar);
}
else
{
- //TheBuilder.Add(NewEdge, TheVer.First().Oriented(TopAbs_REVERSED));
- //TheBuilder.Add(NewEdge, V2.Oriented(TopAbs_FORWARD));
+ if (ToTrimAsOrigin)
+ {
+ fpar = TrPar1;
+ gp_Pnt2d TrPnt2d = PCurve->Value(fpar);
+ gp_Pnt TrPnt(TrPnt2d.X(), TrPnt2d.Y(), 0.);
+ V1 = BRepLib_MakeVertex(TrPnt);
+ }
TheBuilder.Add(NewEdge, V1.Oriented(TopAbs_REVERSED));
TheBuilder.Add(NewEdge, TheVer.First().Oriented(TopAbs_FORWARD));
TheBuilder.Range(NewEdge, fpar, ThePar.First());
TheBuilder.Range(NewEdge,ThePar.Value(k),ThePar.Value(k+1));
+#ifdef OCCT_DEBUG
#ifdef DRAW
if ( AffichEdge) {
char name[256];
Draw::Set(name,dr);
}
#endif
-
+#endif
S.Append(NewEdge);
}
}
}
+//=======================================================================
+//function : IsInnerEdge
+//purpose :
+//=======================================================================
+
+static Standard_Boolean IsInnerEdge(const TopoDS_Shape& ProE,
+ const TopoDS_Face& AllSpine,
+ Standard_Real& TrPar1,
+ Standard_Real& TrPar2)
+{
+ if (ProE.ShapeType() != TopAbs_EDGE)
+ return Standard_False;
+
+ TopoDS_Edge anEdge = TopoDS::Edge(ProE);
+
+ TopTools_IndexedDataMapOfShapeListOfShape VEmap;
+ TopExp::MapShapesAndAncestors(AllSpine, TopAbs_VERTEX, TopAbs_EDGE, VEmap);
+ for (Standard_Integer i = 1; i <= VEmap.Extent(); i++)
+ {
+ const TopTools_ListOfShape& LE = VEmap(i);
+ if (LE.Extent() == 1 && anEdge.IsSame(LE.First()))
+ return Standard_False;
+ }
+
+ BRep_Tool::Range(anEdge, TrPar1, TrPar2);
+ return Standard_True;
+}
+
+
+
//=======================================================================
//function : DoubleOrNotInside
//purpose : return True if V appears twice in LV or is not inside.
//=======================================================================
Standard_Boolean DoubleOrNotInside (const TopTools_ListOfShape& LV,
- const TopoDS_Vertex& V)
+ const TopoDS_Vertex& V)
{
Standard_Boolean Vu = Standard_False;
TopTools_ListIteratorOfListOfShape it(LV);
}
Standard_Boolean IsSmallClosedEdge(const TopoDS_Edge& anEdge,
- const TopoDS_Vertex& aVertex)
+ const TopoDS_Vertex& aVertex)
{
gp_Pnt PV = BRep_Tool::Pnt(aVertex);
gp_Pnt2d PV2d, Pfirst, Plast, Pmid;
}
static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
- const BRepMAT2d_BisectingLocus& Locus,
- const BRepMAT2d_LinkTopoBilo& Link,
- TopTools_ListOfShape& BadEdges)
+ const BRepMAT2d_BisectingLocus& Locus,
+ const BRepMAT2d_LinkTopoBilo& Link,
+ TopTools_ListOfShape& BadEdges)
{
TopoDS_Face F = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
const TopoDS_Shape& SE = Link.GeneratingShape(Locus.BasicElt(ic,ie));
if (SE.ShapeType() == TopAbs_EDGE) {
- if (aMap.Contains(SE)) {
- //cout << "Edge is treated second time" << endl;
- continue;
- }
-
- TopoDS_Edge E = TopoDS::Edge(SE);
-
- Standard_Real f,l;
-
- Handle(Geom2d_Curve) G2d = BRep_Tool::CurveOnSurface(E,F,f,l);
-
- Geom2dAdaptor_Curve AC(G2d,f,l);
- GeomAbs_CurveType aCType = AC.GetType();
-
- if(aCType != GeomAbs_Line && aCType != GeomAbs_Circle) {
-
- Standard_Boolean reverse = Standard_False;
- if (E.Orientation() == TopAbs_FORWARD) reverse = Standard_True;
-
- gp_Pnt2d P, Pc;
- gp_Dir2d N;
-
- Geom2dLProp_CLProps2d aCLProps(G2d, 2, eps);
-
- aCLProps.SetParameter(f);
- if(!aCLProps.IsTangentDefined()) {
- BadEdges.Append(SE);
- aMap.Add(SE);
- continue;
- }
-
- P = aCLProps.Value();
- Standard_Real Crv = aCLProps.Curvature();
-
- if(Crv >= eps) {
- aCLProps.Tangent(N);
- Standard_Real x = N.Y(), y = -N.X();
- N.SetCoord(x, y);
- if (reverse) N.Reverse();
- aCLProps.CentreOfCurvature(Pc);
- gp_Vec2d Dir( P, Pc );
- if (N.Dot(Dir) > 0.) {
- if (LimCurv <= Crv + eps) {
- BadEdges.Append(SE);
- aMap.Add(SE);
- continue;
- }
- }
- }
-
- aCLProps.SetParameter(l);
- if(!aCLProps.IsTangentDefined()) {
- BadEdges.Append(SE);
- aMap.Add(SE);
- continue;
- }
-
- P = aCLProps.Value();
- Crv = aCLProps.Curvature();
-
- if(Crv >= eps) {
- aCLProps.Tangent(N);
- Standard_Real x = N.Y(), y = -N.X();
- N.SetCoord(x, y);
- if (reverse) N.Reverse();
- aCLProps.CentreOfCurvature(Pc);
- gp_Vec2d Dir( P, Pc );
- if (N.Dot(Dir) > 0.) {
- if (LimCurv <= Crv + eps) {
- BadEdges.Append(SE);
- aMap.Add(SE);
- continue;
- }
- }
- }
- }
+
+ if (aMap.Contains(SE)) {
+ //std::cout << "Edge is treated second time" << std::endl;
+ continue;
+ }
+
+
+ TopoDS_Edge E = TopoDS::Edge(SE);
+
+
+ Standard_Real f,l;
+
+
+ Handle(Geom2d_Curve) G2d = BRep_Tool::CurveOnSurface(E,F,f,l);
+
+
+ Geom2dAdaptor_Curve AC(G2d,f,l);
+ GeomAbs_CurveType aCType = AC.GetType();
+
+
+ if(aCType != GeomAbs_Line && aCType != GeomAbs_Circle) {
+
+
+ Standard_Boolean reverse = Standard_False;
+ if (E.Orientation() == TopAbs_FORWARD) reverse = Standard_True;
+
+
+ gp_Pnt2d P, Pc;
+ gp_Dir2d N;
+
+
+ Geom2dLProp_CLProps2d aCLProps(G2d, 2, eps);
+
+
+ aCLProps.SetParameter(f);
+ if(!aCLProps.IsTangentDefined()) {
+ BadEdges.Append(SE);
+ aMap.Add(SE);
+ continue;
+ }
+
+
+ P = aCLProps.Value();
+ Standard_Real Crv = aCLProps.Curvature();
+
+
+ if(Crv >= eps) {
+ aCLProps.Tangent(N);
+ Standard_Real x = N.Y(), y = -N.X();
+ N.SetCoord(x, y);
+ if (reverse) N.Reverse();
+ aCLProps.CentreOfCurvature(Pc);
+ gp_Vec2d Dir( P, Pc );
+ if (N.Dot(Dir) > 0.) {
+ if (LimCurv <= Crv + eps) {
+ BadEdges.Append(SE);
+ aMap.Add(SE);
+ continue;
+ }
+ }
+ }
+
+
+ aCLProps.SetParameter(l);
+ if(!aCLProps.IsTangentDefined()) {
+ BadEdges.Append(SE);
+ aMap.Add(SE);
+ continue;
+ }
+
+
+ P = aCLProps.Value();
+ Crv = aCLProps.Curvature();
+
+
+ if(Crv >= eps) {
+ aCLProps.Tangent(N);
+ Standard_Real x = N.Y(), y = -N.X();
+ N.SetCoord(x, y);
+ if (reverse) N.Reverse();
+ aCLProps.CentreOfCurvature(Pc);
+ gp_Vec2d Dir( P, Pc );
+ if (N.Dot(Dir) > 0.) {
+ if (LimCurv <= Crv + eps) {
+ BadEdges.Append(SE);
+ aMap.Add(SE);
+ continue;
+ }
+ }
+ }
+ }
}
}
}
//=======================================================================
static Standard_Boolean PerformCurve (TColStd_SequenceOfReal& Parameters,
- TColgp_SequenceOfPnt& Points,
- const Adaptor3d_Curve& C,
- const Standard_Real Deflection,
- const Standard_Real U1,
- const Standard_Real U2,
- const Standard_Real EPSILON,
- const Standard_Integer Nbmin)
+
+ TColgp_SequenceOfPnt& Points,
+ const Adaptor3d_Curve& C,
+ const Standard_Real Deflection,
+ const Standard_Real U1,
+ const Standard_Real U2,
+ const Standard_Real EPSILON,
+ const Standard_Integer Nbmin)
{
Standard_Real UU1 = Min(U1, U2);
Standard_Real UU2 = Max(U1, U2);
if((aDelta/aDist) > 5.0e-14)
{
QuasiFleche(C,Deflection*Deflection,
- UU1,Pdeb,
- Ddeb,
- UU2,Pfin,
- Dfin,
- Nbmin,
- EPSILON*EPSILON,
- Parameters,Points);
+
+ UU1,Pdeb,
+ Ddeb,
+ UU2,Pfin,
+ Dfin,
+ Nbmin,
+ EPSILON*EPSILON,
+ Parameters,Points);
}
return Standard_True;
//=======================================================================
static void QuasiFleche(const Adaptor3d_Curve& C,
- const Standard_Real Deflection2,
- const Standard_Real Udeb,
- const gp_Pnt& Pdeb,
- const gp_Vec& Vdeb,
- const Standard_Real Ufin,
- const gp_Pnt& Pfin,
- const gp_Vec& Vfin,
- const Standard_Integer Nbmin,
- const Standard_Real Eps,
- TColStd_SequenceOfReal& Parameters,
- TColgp_SequenceOfPnt& Points)
+
+ const Standard_Real Deflection2,
+ const Standard_Real Udeb,
+ const gp_Pnt& Pdeb,
+ const gp_Vec& Vdeb,
+ const Standard_Real Ufin,
+ const gp_Pnt& Pfin,
+ const gp_Vec& Vfin,
+ const Standard_Integer Nbmin,
+ const Standard_Real Eps,
+ TColStd_SequenceOfReal& Parameters,
+ TColgp_SequenceOfPnt& Points)
{
Standard_Integer Ptslength = Points.Length();
Standard_Real Udelta = Ufin-Udeb;
Standard_Real N2 = Vdelta.SquareMagnitude();
if (N1 > Eps && N2 > Eps) {
Standard_Real Normediff =
- (Vdeb.Normalized().XYZ()-Vdelta.Normalized().XYZ()).SquareModulus();
+
+ (Vdeb.Normalized().XYZ()-Vdelta.Normalized().XYZ()).SquareModulus();
if (Normediff > Eps) {
- theFleche = Normediff*Norme/64.;
- flecheok = Standard_True;
+
+ theFleche = Normediff*Norme/64.;
+ flecheok = Standard_True;
}
}
}
}
else {
QuasiFleche(C,Deflection2,Udeb,Pdeb,
- Vdeb,
- Udeb+Udelta,Pdelta,
- Vdelta,
- 3,
- Eps,
- Parameters,Points);
+
+ Vdeb,
+ Udeb+Udelta,Pdelta,
+ Vdelta,
+ 3,
+ Eps,
+ Parameters,Points);
}
if (Nbmin > 2) {
QuasiFleche(C,Deflection2,Udeb+Udelta,Pdelta,
- Vdelta,
- Ufin,Pfin,
- Vfin,
- Nbmin-(Points.Length()-Ptslength),
- Eps,
- Parameters,Points);
+
+ Vdelta,
+ Ufin,Pfin,
+ Vfin,
+ Nbmin-(Points.Length()-Ptslength),
+ Eps,
+ Parameters,Points);
+ }
+}
+
+Standard_Boolean CheckSmallParamOnEdge(const TopoDS_Edge& anEdge)
+{
+ const BRep_ListOfCurveRepresentation& aList = ((Handle(BRep_TEdge)::DownCast(anEdge.TShape()))->Curves());
+ if (!aList.IsEmpty())
+ {
+ Handle( BRep_CurveRepresentation ) CRep = ((Handle(BRep_TEdge)::DownCast(anEdge.TShape()))->Curves()).First();
+ Standard_Real f = (Handle(BRep_GCurve)::DownCast(CRep))->First();
+ Standard_Real l = (Handle(BRep_GCurve)::DownCast(CRep))->Last();
+ if (Abs (l - f) < Precision::PConfusion())
+ return Standard_False;
}
+ return Standard_True;
}
+
projects / occt.git / blobdiff