Merge branch 'master' of github.com:FreeCAD/FreeCAD
This commit is contained in:
commit
d76df0ac94
|
@ -107,6 +107,7 @@ ViewProviderPath::ViewProviderPath()
|
|||
|
||||
pcLines = new PartGui::SoBrepEdgeSet();
|
||||
pcLines->ref();
|
||||
pcLines->coordIndex.setNum(0);
|
||||
|
||||
pcLineColor = new SoMaterial;
|
||||
pcLineColor->ref();
|
||||
|
|
|
@ -43,7 +43,7 @@ def makeAreaVertex(seg):
|
|||
segtype = int(seg.Curve.Axis.z) # 1=ccw arc,-1=cw arc
|
||||
vertex = area.Vertex(segtype, area.Point(seg.valueAt(seg.LastParameter)[0], seg.valueAt(
|
||||
seg.LastParameter)[1]), area.Point(seg.Curve.Center.x, seg.Curve.Center.y))
|
||||
elif isinstance(seg.Curve, Part.LineSegment):
|
||||
elif isinstance(seg.Curve, Part.LineSegment) or isinstance(seg.Curve, Part.Line):
|
||||
point1 = seg.valueAt(seg.FirstParameter)[
|
||||
0], seg.valueAt(seg.FirstParameter)[1]
|
||||
point2 = seg.valueAt(seg.LastParameter)[
|
||||
|
|
|
@ -247,7 +247,7 @@ def reverseEdge(e):
|
|||
arcendpt = e.valueAt(e.LastParameter)
|
||||
arcofCirc = Part.ArcOfCircle(arcendpt, arcmid, arcstpt)
|
||||
newedge = arcofCirc.toShape()
|
||||
elif geomType(e) == "LineSegment":
|
||||
elif geomType(e) == "LineSegment" or geomType(e) == "Line":
|
||||
stpt = e.valueAt(e.FirstParameter)
|
||||
endpt = e.valueAt(e.LastParameter)
|
||||
newedge = Part.makeLine(endpt, stpt)
|
||||
|
|
Loading…
Reference in New Issue
Block a user