suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeCAD/FreeCAD

Browse Source
This commit is contained in:
Yorik van Havre 2016-12-03 13:01:07 -02:00
commit d76df0ac94
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Path/Gui/ViewProviderPath.cpp
View File

@ -107,6 +107,7 @@ ViewProviderPath::ViewProviderPath()
pcLines = new PartGui::SoBrepEdgeSet(); pcLines = new PartGui::SoBrepEdgeSet();
pcLines->ref(); pcLines->ref();
pcLines->coordIndex.setNum(0);
pcLineColor = new SoMaterial; pcLineColor = new SoMaterial;
pcLineColor->ref(); pcLineColor->ref();

2
src/Mod/Path/PathScripts/PathKurveUtils.py
View File

@ -43,7 +43,7 @@ def makeAreaVertex(seg):
segtype = int(seg.Curve.Axis.z) # 1=ccw arc,-1=cw arc 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( 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)) 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)[ point1 = seg.valueAt(seg.FirstParameter)[
0], seg.valueAt(seg.FirstParameter)[1] 0], seg.valueAt(seg.FirstParameter)[1]
point2 = seg.valueAt(seg.LastParameter)[ point2 = seg.valueAt(seg.LastParameter)[

2
src/Mod/Path/PathScripts/PathUtils.py
View File

@ -247,7 +247,7 @@ def reverseEdge(e):
arcendpt = e.valueAt(e.LastParameter) arcendpt = e.valueAt(e.LastParameter)
arcofCirc = Part.ArcOfCircle(arcendpt, arcmid, arcstpt) arcofCirc = Part.ArcOfCircle(arcendpt, arcmid, arcstpt)
newedge = arcofCirc.toShape() newedge = arcofCirc.toShape()
elif geomType(e) == "LineSegment": elif geomType(e) == "LineSegment" or geomType(e) == "Line":
stpt = e.valueAt(e.FirstParameter) stpt = e.valueAt(e.FirstParameter)
endpt = e.valueAt(e.LastParameter) endpt = e.valueAt(e.LastParameter)
newedge = Part.makeLine(endpt, stpt) newedge = Part.makeLine(endpt, stpt)