robossembler/framework
7
0
Fork 0
Code Issues 21 Pull requests Projects Releases Packages Wiki Activity Actions

Typos and change of "Infinite" in Part.Line

Browse source
This commit is contained in:
Mathias Hauan Arbo 2018-08-07 13:50:29 +02:00
parent df8b716c5c
commit f6e71064dd
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ARTools.py
View file

@ -393,7 +393,9 @@ def exportPartInfoAndFeaturesDialogue():
appendFeatureFrames(unique_selected[0], ofile) appendFeatureFrames(unique_selected[0], ofile)
if len(unique_selected) > 1: if len(unique_selected) > 1:
FreeCAD.Console.PrintWarning("Multi-part export not yet supported.\n") FreeCAD.Console.PrintWarning("Multi-part export not yet supported.\n")
FreeCAD.Console.PrintMessage("Feature frames of " + str(unique_selected[0].Label) + " exported to " + str(ofile) + "\n") FreeCAD.Console.PrintMessage("Feature frames of "
+ str(unique_selected[0].Label)
+ " exported to " + str(ofile) + "\n")
################################################################### ###################################################################
@ -419,7 +421,7 @@ def getPrimitiveInfo(prim_type, subobj, scale=1e-3):
d["radius"] = scale*subobj.Curve.Radius d["radius"] = scale*subobj.Curve.Radius
d["center"] = vector2list(subobj.Curve.Center, scale) d["center"] = vector2list(subobj.Curve.Center, scale)
d["axis"] = vector2list(subobj.Curve.Axis, scale=1) d["axis"] = vector2list(subobj.Curve.Axis, scale=1)
d["paramerrange"] = subobj.ParameterRange d["parameterrange"] = subobj.ParameterRange
elif prim_type == "ArcOfEllipse": elif prim_type == "ArcOfEllipse":
d["center"] = vector2list(subobj.Curve.Center, scale) d["center"] = vector2list(subobj.Curve.Center, scale)
d["axis"] = vector2list(subobj.Curve.Axis, scale=1) d["axis"] = vector2list(subobj.Curve.Axis, scale=1)
@ -446,7 +448,7 @@ def getPrimitiveInfo(prim_type, subobj, scale=1e-3):
d["radius"] = scale*subobj.Curve.Radius d["radius"] = scale*subobj.Curve.Radius
d["center"] = vector2list(subobj.Curve.Center, scale) d["center"] = vector2list(subobj.Curve.Center, scale)
d["axis"] = vector2list(subobj.Curve.Axis, scale=1) d["axis"] = vector2list(subobj.Curve.Axis, scale=1)
d["paramerrange"] = subobj.ParameterRange d["parameterrange"] = subobj.ParameterRange
elif prim_type == "Ellipse": elif prim_type == "Ellipse":
d["center"] = vector2list(subobj.Curve.Center, scale) d["center"] = vector2list(subobj.Curve.Center, scale)
d["axis"] = vector2list(subobj.Curve.Axis, scale=1) d["axis"] = vector2list(subobj.Curve.Axis, scale=1)
@ -459,17 +461,22 @@ def getPrimitiveInfo(prim_type, subobj, scale=1e-3):
d["center"] = vector2list(subobj.Curve.Center, scale) d["center"] = vector2list(subobj.Curve.Center, scale)
d["majorradius"] = scale*subobj.Curve.MajorRadius d["majorradius"] = scale*subobj.Curve.MajorRadius
d["minorradius"] = scale*subobj.Curve.MinorRadius d["minorradius"] = scale*subobj.Curve.MinorRadius
d["parameterrange"] = subobj.ParameterRange d["parameterrange"] = subobj.ParameterRange
elif prim_type == "Parabola": elif prim_type == "Parabola":
d["anglexu"] = subobj.Curve.AngleXU d["anglexu"] = subobj.Curve.AngleXU
d["axis"] = vector2list(subobj.Curve.Axis, scale=1) d["axis"] = vector2list(subobj.Curve.Axis, scale=1)
d["center"] = vector2list(subobj.Curve.Center, scale) d["center"] = vector2list(subobj.Curve.Center, scale)
d["focal"] = scale*subobj.Curve.Focal d["focal"] = scale*subobj.Curve.Focal
elif prim_type == "Line": elif prim_type == "Line":
if not subobj.Curve.Infinite: if not hasattr(subobj.Curve, "Infinite"):
d["startpoint"] = vector2list(subobj.Curve.StartPoint) d["startpoint"] = vector2list(subobj.Curve.StartPoint)
d["endpoint"] = vector2list(subobj.Curve.EndPoint) d["endpoint"] = vector2list(subobj.Curve.EndPoint)
d["infinite"] = subobj.Curve.Infinite if hasattr(subobj.Curve, "Infinite"):
if subobj.Curve.Infinite:
d["infinite"] = subobj.Curve.Infinite
else:
d["startpoint"] = vector2list(subobj.Curve.StartPoint)
d["endpoint"] = vector2list(subobj.Curve.EndPoint)
elif prim_type == "BSplineSurface": elif prim_type == "BSplineSurface":
FreeCAD.Console.PrintWarning("getPrimitiveInfo of BSpline incomplete.") FreeCAD.Console.PrintWarning("getPrimitiveInfo of BSpline incomplete.")
elif prim_type == "BezierSurface": elif prim_type == "BezierSurface":