From 125d0ca84d3d7676784e8098751ce7a8dce2c82a Mon Sep 17 00:00:00 2001 From: carlopav Date: Tue, 12 May 2020 20:59:17 +0200 Subject: [PATCH] Draft: various cleanup Mainly added an empty line at the end of each file and changed docstrings. --- src/Mod/Draft/draftfunctions/array.py | 90 ++++++++++--------- src/Mod/Draft/draftfunctions/downgrade.py | 1 - src/Mod/Draft/draftfunctions/heal.py | 2 +- src/Mod/Draft/draftfunctions/join.py | 2 +- src/Mod/Draft/draftfunctions/move.py | 16 ++++ src/Mod/Draft/draftfunctions/rotate.py | 23 ++++- src/Mod/Draft/draftfunctions/scale.py | 22 ++++- src/Mod/Draft/draftfunctions/split.py | 2 +- src/Mod/Draft/draftmake/make_array.py | 8 +- src/Mod/Draft/draftmake/make_block.py | 2 +- src/Mod/Draft/draftmake/make_circle.py | 2 +- src/Mod/Draft/draftmake/make_clone.py | 2 +- src/Mod/Draft/draftmake/make_copy.py | 3 +- src/Mod/Draft/draftmake/make_drawingview.py | 6 +- src/Mod/Draft/draftmake/make_ellipse.py | 2 +- src/Mod/Draft/draftmake/make_facebinder.py | 2 +- src/Mod/Draft/draftmake/make_line.py | 2 +- src/Mod/Draft/draftmake/make_patharray.py | 3 +- src/Mod/Draft/draftmake/make_point.py | 2 +- src/Mod/Draft/draftmake/make_pointarray.py | 2 +- src/Mod/Draft/draftmake/make_polygon.py | 2 +- src/Mod/Draft/draftmake/make_rectangle.py | 2 +- src/Mod/Draft/draftmake/make_shape2dview.py | 2 +- src/Mod/Draft/draftmake/make_shapestring.py | 2 +- src/Mod/Draft/draftmake/make_sketch.py | 2 +- src/Mod/Draft/draftmake/make_wire.py | 2 +- src/Mod/Draft/draftmake/make_wpproxy.py | 2 +- src/Mod/Draft/draftobjects/array.py | 5 +- src/Mod/Draft/draftobjects/base.py | 2 +- src/Mod/Draft/draftobjects/bezcurve.py | 2 +- src/Mod/Draft/draftobjects/block.py | 2 +- src/Mod/Draft/draftobjects/bspline.py | 2 +- src/Mod/Draft/draftobjects/circle.py | 2 +- src/Mod/Draft/draftobjects/clone.py | 2 +- src/Mod/Draft/draftobjects/dimension.py | 2 - src/Mod/Draft/draftobjects/draftlink.py | 8 +- src/Mod/Draft/draftobjects/drawingview.py | 8 +- src/Mod/Draft/draftobjects/ellipse.py | 2 +- src/Mod/Draft/draftobjects/facebinder.py | 2 +- src/Mod/Draft/draftobjects/label.py | 2 +- src/Mod/Draft/draftobjects/point.py | 2 +- src/Mod/Draft/draftobjects/pointarray.py | 2 +- src/Mod/Draft/draftobjects/polygon.py | 2 +- src/Mod/Draft/draftobjects/rectangle.py | 2 +- src/Mod/Draft/draftobjects/shape2dview.py | 2 +- src/Mod/Draft/draftobjects/shapestring.py | 2 +- src/Mod/Draft/draftobjects/wire.py | 2 +- src/Mod/Draft/draftobjects/wpproxy.py | 2 +- .../Draft/draftviewproviders/view_array.py | 2 +- src/Mod/Draft/draftviewproviders/view_base.py | 2 +- .../Draft/draftviewproviders/view_clone.py | 2 +- .../view_draft_annotation.py | 2 - .../draftviewproviders/view_draftlink.py | 2 +- .../draftviewproviders/view_facebinder.py | 2 +- .../Draft/draftviewproviders/view_label.py | 2 +- .../Draft/draftviewproviders/view_point.py | 2 +- .../draftviewproviders/view_rectangle.py | 2 +- 57 files changed, 170 insertions(+), 113 deletions(-) diff --git a/src/Mod/Draft/draftfunctions/array.py b/src/Mod/Draft/draftfunctions/array.py index b9c38c26f9..7dfc221ce8 100644 --- a/src/Mod/Draft/draftfunctions/array.py +++ b/src/Mod/Draft/draftfunctions/array.py @@ -60,49 +60,53 @@ def array(objectslist, arg1, arg2, arg3, arg4=None, arg5=None, arg6=None): array(objectslist, center, totalangle, totalnum) for polar array """ - def rectArray(objectslist,xvector,yvector,xnum,ynum): - utils.type_check([(xvector, App.Vector), - (yvector, App.Vector), - (xnum,int), (ynum,int)], - "rectArray") - if not isinstance(objectslist,list): objectslist = [objectslist] - for xcount in range(xnum): - currentxvector=App.Vector(xvector).multiply(xcount) - if not xcount==0: - move(objectslist,currentxvector,True) - for ycount in range(ynum): - currentxvector=App.Vector(currentxvector) - currentyvector=currentxvector.add(App.Vector(yvector).multiply(ycount)) - if not ycount==0: - move(objectslist,currentyvector,True) - - def rectArray2(objectslist,xvector,yvector,zvector,xnum,ynum,znum): - utils.type_check([(xvector,App.Vector), (yvector,App.Vector), (zvector,App.Vector),(xnum,int), (ynum,int),(znum,int)], "rectArray2") - if not isinstance(objectslist,list): objectslist = [objectslist] - for xcount in range(xnum): - currentxvector=App.Vector(xvector).multiply(xcount) - if not xcount==0: - move(objectslist,currentxvector,True) - for ycount in range(ynum): - currentxvector=App.Vector(currentxvector) - currentyvector=currentxvector.add(App.Vector(yvector).multiply(ycount)) - if not ycount==0: - move(objectslist,currentyvector,True) - for zcount in range(znum): - currentzvector=currentyvector.add(App.Vector(zvector).multiply(zcount)) - if not zcount==0: - move(objectslist,currentzvector,True) - - def polarArray(objectslist,center,angle,num): - utils.type_check([(center,App.Vector), (num,int)], "polarArray") - if not isinstance(objectslist,list): objectslist = [objectslist] - fraction = float(angle)/num - for i in range(num): - currangle = fraction + (i*fraction) - rotate(objectslist,currangle,center,copy=True) if arg6: - rectArray2(objectslist,arg1,arg2,arg3,arg4,arg5,arg6) + rectArray2(objectslist, arg1, arg2, arg3, arg4, arg5, arg6) elif arg4: - rectArray(objectslist,arg1,arg2,arg3,arg4) + rectArray(objectslist, arg1,arg2, arg3, arg4) else: - polarArray(objectslist,arg1,arg2,arg3) \ No newline at end of file + polarArray(objectslist, arg1, arg2, arg3) + + +def rectArray(objectslist,xvector,yvector,xnum,ynum): + utils.type_check([(xvector, App.Vector), + (yvector, App.Vector), + (xnum,int), (ynum,int)], + "rectArray") + if not isinstance(objectslist,list): objectslist = [objectslist] + for xcount in range(xnum): + currentxvector=App.Vector(xvector).multiply(xcount) + if not xcount==0: + move(objectslist,currentxvector,True) + for ycount in range(ynum): + currentxvector=App.Vector(currentxvector) + currentyvector=currentxvector.add(App.Vector(yvector).multiply(ycount)) + if not ycount==0: + move(objectslist,currentyvector,True) + + +def rectArray2(objectslist,xvector,yvector,zvector,xnum,ynum,znum): + utils.type_check([(xvector,App.Vector), (yvector,App.Vector), (zvector,App.Vector),(xnum,int), (ynum,int),(znum,int)], "rectArray2") + if not isinstance(objectslist,list): objectslist = [objectslist] + for xcount in range(xnum): + currentxvector=App.Vector(xvector).multiply(xcount) + if not xcount==0: + move(objectslist,currentxvector,True) + for ycount in range(ynum): + currentxvector=App.Vector(currentxvector) + currentyvector=currentxvector.add(App.Vector(yvector).multiply(ycount)) + if not ycount==0: + move(objectslist,currentyvector,True) + for zcount in range(znum): + currentzvector=currentyvector.add(App.Vector(zvector).multiply(zcount)) + if not zcount==0: + move(objectslist,currentzvector,True) + + +def polarArray(objectslist,center,angle,num): + utils.type_check([(center,App.Vector), (num,int)], "polarArray") + if not isinstance(objectslist,list): objectslist = [objectslist] + fraction = float(angle)/num + for i in range(num): + currangle = fraction + (i*fraction) + rotate(objectslist,currangle,center,copy=True) diff --git a/src/Mod/Draft/draftfunctions/downgrade.py b/src/Mod/Draft/draftfunctions/downgrade.py index 2b8bffefe4..5b80716e2f 100644 --- a/src/Mod/Draft/draftfunctions/downgrade.py +++ b/src/Mod/Draft/draftfunctions/downgrade.py @@ -271,4 +271,3 @@ def downgrade(objects, delete=False, force=None): App.ActiveDocument.removeObject(n) gui_utils.select(addList) return [addList,deleteList] - diff --git a/src/Mod/Draft/draftfunctions/heal.py b/src/Mod/Draft/draftfunctions/heal.py index 9497e86c05..c5876fcb83 100644 --- a/src/Mod/Draft/draftfunctions/heal.py +++ b/src/Mod/Draft/draftfunctions/heal.py @@ -112,4 +112,4 @@ def heal(objlist=None, delete=True, reparent=True): if dellist and delete: for n in dellist: - App.ActiveDocument.removeObject(n) \ No newline at end of file + App.ActiveDocument.removeObject(n) diff --git a/src/Mod/Draft/draftfunctions/join.py b/src/Mod/Draft/draftfunctions/join.py index a2e94b073e..052e0844ba 100644 --- a/src/Mod/Draft/draftfunctions/join.py +++ b/src/Mod/Draft/draftfunctions/join.py @@ -88,4 +88,4 @@ def join_two_wires(wire1, wire2): return True -joinTwoWires = join_two_wires \ No newline at end of file +joinTwoWires = join_two_wires diff --git a/src/Mod/Draft/draftfunctions/move.py b/src/Mod/Draft/draftfunctions/move.py index c04b801978..71e89b1855 100644 --- a/src/Mod/Draft/draftfunctions/move.py +++ b/src/Mod/Draft/draftfunctions/move.py @@ -169,6 +169,10 @@ def move(objectslist, vector, copy=False): def move_vertex(object, vertex_index, vector): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ points = object.Points points[vertex_index] = points[vertex_index].add(vector) object.Points = points @@ -178,6 +182,10 @@ moveVertex = move_vertex def move_edge(object, edge_index, vector): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ moveVertex(object, edge_index, vector) if utils.isClosedEdge(edge_index, object): moveVertex(object, 0, vector) @@ -189,6 +197,10 @@ moveEdge = move_edge def copy_moved_edges(arguments): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ copied_edges = [] for argument in arguments: copied_edges.append(copy_moved_edge(argument[0], argument[1], argument[2])) @@ -199,6 +211,10 @@ copyMovedEdges = copy_moved_edges def copy_moved_edge(object, edge_index, vector): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ vertex1 = object.Placement.multVec(object.Points[edge_index]).add(vector) if utils.isClosedEdge(edge_index, object): vertex2 = object.Placement.multVec(object.Points[0]).add(vector) diff --git a/src/Mod/Draft/draftfunctions/rotate.py b/src/Mod/Draft/draftfunctions/rotate.py index 7016e70639..2989d4c8d7 100644 --- a/src/Mod/Draft/draftfunctions/rotate.py +++ b/src/Mod/Draft/draftfunctions/rotate.py @@ -154,6 +154,10 @@ def rotate(objectslist, angle, center=App.Vector(0,0,0), def rotate_vertex(object, vertex_index, angle, center, axis): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ points = object.Points points[vertex_index] = object.Placement.inverse().multVec( rotate_vector_from_center( @@ -166,6 +170,10 @@ rotateVertex = rotate_vertex def rotate_vector_from_center(vector, angle, axis, center): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ rv = vector.sub(center) rv = DraftVecUtils.rotate(rv, math.radians(angle), axis) return center.add(rv) @@ -175,6 +183,10 @@ rotateVectorFromCenter = rotate_vector_from_center def rotate_edge(object, edge_index, angle, center, axis): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ rotateVertex(object, edge_index, angle, center, axis) if utils.isClosedEdge(edge_index, object): rotateVertex(object, 0, angle, center, axis) @@ -186,6 +198,10 @@ rotateEdge = rotate_edge def copy_rotated_edges(arguments): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ copied_edges = [] for argument in arguments: copied_edges.append(copy_rotated_edge(argument[0], argument[1], @@ -197,6 +213,10 @@ copyRotatedEdges = copy_rotated_edges def copy_rotated_edge(object, edge_index, angle, center, axis): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ vertex1 = rotate_vector_from_center( object.Placement.multVec(object.Points[edge_index]), angle, axis, center) @@ -208,4 +228,5 @@ def copy_rotated_edge(object, edge_index, angle, center, axis): vertex2 = rotate_vector_from_center( object.Placement.multVec(object.Points[edge_index+1]), angle, axis, center) - return make_line(vertex1, vertex2) \ No newline at end of file + return make_line(vertex1, vertex2) + \ No newline at end of file diff --git a/src/Mod/Draft/draftfunctions/scale.py b/src/Mod/Draft/draftfunctions/scale.py index 97b74a86b1..7431568f71 100644 --- a/src/Mod/Draft/draftfunctions/scale.py +++ b/src/Mod/Draft/draftfunctions/scale.py @@ -129,6 +129,10 @@ def scale(objectslist, scale=App.Vector(1,1,1), def scale_vertex(obj, vertex_index, scale, center): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ points = obj.Points points[vertex_index] = obj.Placement.inverse().multVec( scaleVectorFromCenter( @@ -141,6 +145,10 @@ scaleVertex = scale_vertex def scale_vector_from_center(vector, scale, center): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ return vector.sub(center).scale(scale.x, scale.y, scale.z).add(center) @@ -148,6 +156,10 @@ scaleVectorFromCenter = scale_vector_from_center def scale_edge(obj, edge_index, scale, center): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ scaleVertex(obj, edge_index, scale, center) if utils.isClosedEdge(edge_index, obj): scaleVertex(obj, 0, scale, center) @@ -159,6 +171,10 @@ scaleEdge = scale_edge def copy_scaled_edge(obj, edge_index, scale, center): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ import Part vertex1 = scaleVectorFromCenter( obj.Placement.multVec(obj.Points[edge_index]), @@ -178,6 +194,10 @@ copyScaledEdge = copy_scaled_edge def copy_scaled_edges(arguments): + """ + Needed for SubObjects modifiers. + Implemented by Dion Moult during 0.19 dev cycle (works only with Draft Wire). + """ copied_edges = [] for argument in arguments: copied_edges.append(copyScaledEdge(argument[0], argument[1], @@ -185,4 +205,4 @@ def copy_scaled_edges(arguments): join_wires(copied_edges) -copyScaledEdges = copy_scaled_edges \ No newline at end of file +copyScaledEdges = copy_scaled_edges diff --git a/src/Mod/Draft/draftfunctions/split.py b/src/Mod/Draft/draftfunctions/split.py index 16f55c79e4..b8cdd7a195 100644 --- a/src/Mod/Draft/draftfunctions/split.py +++ b/src/Mod/Draft/draftfunctions/split.py @@ -70,4 +70,4 @@ def split_open_wire(wire, newPoint, edgeIndex): make_wire(wire2Points, placement=wire.Placement) -splitOpenWire = split_open_wire \ No newline at end of file +splitOpenWire = split_open_wire diff --git a/src/Mod/Draft/draftmake/make_array.py b/src/Mod/Draft/draftmake/make_array.py index 1c84ebf7de..32c8c7becc 100644 --- a/src/Mod/Draft/draftmake/make_array.py +++ b/src/Mod/Draft/draftmake/make_array.py @@ -45,7 +45,7 @@ def make_array(baseobject, arg1, arg2, arg3, arg4=None, Rectangular array - ------ + ----------------- make_array(object,xvector,yvector,xnum,ynum,[name]) makeArray(object,xvector,yvector,zvector,xnum,ynum,znum,[name]) @@ -55,7 +55,7 @@ def make_array(baseobject, arg1, arg2, arg3, arg4=None, Polar array - ------ + ----------- makeArray(object,center,totalangle,totalnum,[name]) for polar array, or center is a vector, totalangle is the angle to cover (in degrees) and totalnum @@ -63,7 +63,7 @@ def make_array(baseobject, arg1, arg2, arg3, arg4=None, Circular array - ------ + -------------- makeArray(object,rdistance,tdistance,axis,center,ncircles,symmetry,[name]) In case of a circular array, rdistance is the distance of the @@ -122,4 +122,4 @@ def make_array(baseobject, arg1, arg2, arg3, arg4=None, return obj -makeArray = make_array \ No newline at end of file +makeArray = make_array diff --git a/src/Mod/Draft/draftmake/make_block.py b/src/Mod/Draft/draftmake/make_block.py index 199a8a1f5d..fe59879138 100644 --- a/src/Mod/Draft/draftmake/make_block.py +++ b/src/Mod/Draft/draftmake/make_block.py @@ -60,4 +60,4 @@ def make_block(objectslist): return obj -makeBlock = make_block \ No newline at end of file +makeBlock = make_block diff --git a/src/Mod/Draft/draftmake/make_circle.py b/src/Mod/Draft/draftmake/make_circle.py index 5950e0cb8c..81db395ba8 100644 --- a/src/Mod/Draft/draftmake/make_circle.py +++ b/src/Mod/Draft/draftmake/make_circle.py @@ -132,4 +132,4 @@ def make_circle(radius, placement=None, face=None, startangle=None, endangle=Non return obj -makeCircle = make_circle \ No newline at end of file +makeCircle = make_circle diff --git a/src/Mod/Draft/draftmake/make_clone.py b/src/Mod/Draft/draftmake/make_clone.py index a3446bf8a2..8cf99be658 100644 --- a/src/Mod/Draft/draftmake/make_clone.py +++ b/src/Mod/Draft/draftmake/make_clone.py @@ -130,4 +130,4 @@ def make_clone(obj, delta=None, forcedraft=False): return cl -clone = make_clone \ No newline at end of file +clone = make_clone diff --git a/src/Mod/Draft/draftmake/make_copy.py b/src/Mod/Draft/draftmake/make_copy.py index 57ffb35a5e..563184207d 100644 --- a/src/Mod/Draft/draftmake/make_copy.py +++ b/src/Mod/Draft/draftmake/make_copy.py @@ -208,4 +208,5 @@ def make_copy(obj, force=None, reparent=False): setattr(par, prop, newobj) gui_utils.format_object(newobj, obj) - return newobj \ No newline at end of file + return newobj + \ No newline at end of file diff --git a/src/Mod/Draft/draftmake/make_drawingview.py b/src/Mod/Draft/draftmake/make_drawingview.py index 56f83b4a3b..1ac914520d 100644 --- a/src/Mod/Draft/draftmake/make_drawingview.py +++ b/src/Mod/Draft/draftmake/make_drawingview.py @@ -21,10 +21,11 @@ # * * # *************************************************************************** """This module provides the code for Draft make_drawing_view function. +OBSOLETE: Drawing Workbench was substituted by TechDraw. """ ## @package make_drawingview # \ingroup DRAFT -# \brief This module provides the code for Draft make_drawing_view function. +# \brief This module provides the code for Draft make_drawing_view function import FreeCAD as App @@ -37,6 +38,7 @@ def make_drawing_view(obj, page, lwmod=None, tmod=None, otherProjection=None): """ make_drawing_view(object,page,[lwmod,tmod]) + This function is OBSOLETE, since TechDraw substituted the Drawing Workbench. Add a View of the given object to the given page. Parameters @@ -101,4 +103,4 @@ def make_drawing_view(obj, page, lwmod=None, tmod=None, otherProjection=None): return viewobj -makeDrawingView = make_drawing_view \ No newline at end of file +makeDrawingView = make_drawing_view diff --git a/src/Mod/Draft/draftmake/make_ellipse.py b/src/Mod/Draft/draftmake/make_ellipse.py index cd6cade68d..34bde14e7b 100644 --- a/src/Mod/Draft/draftmake/make_ellipse.py +++ b/src/Mod/Draft/draftmake/make_ellipse.py @@ -82,4 +82,4 @@ def make_ellipse(majradius, minradius, placement=None, face=True, support=None): return obj -makeEllipse = make_ellipse \ No newline at end of file +makeEllipse = make_ellipse diff --git a/src/Mod/Draft/draftmake/make_facebinder.py b/src/Mod/Draft/draftmake/make_facebinder.py index a4c5022ccd..ab3b924a23 100644 --- a/src/Mod/Draft/draftmake/make_facebinder.py +++ b/src/Mod/Draft/draftmake/make_facebinder.py @@ -63,4 +63,4 @@ def make_facebinder(selectionset, name="Facebinder"): return fb -makeFacebinder = make_facebinder \ No newline at end of file +makeFacebinder = make_facebinder diff --git a/src/Mod/Draft/draftmake/make_line.py b/src/Mod/Draft/draftmake/make_line.py index e7f84fee27..73f5659a37 100644 --- a/src/Mod/Draft/draftmake/make_line.py +++ b/src/Mod/Draft/draftmake/make_line.py @@ -70,4 +70,4 @@ def make_line(first_param, last_param=None): return obj -makeLine = make_line \ No newline at end of file +makeLine = make_line diff --git a/src/Mod/Draft/draftmake/make_patharray.py b/src/Mod/Draft/draftmake/make_patharray.py index ddfa2a6aea..6bbdcc390d 100644 --- a/src/Mod/Draft/draftmake/make_patharray.py +++ b/src/Mod/Draft/draftmake/make_patharray.py @@ -110,4 +110,5 @@ def make_path_array(baseobject,pathobject,count,xlate=None,align=False,pathobjsu gui_utils.select(obj) return obj -makePathArray = make_path_array \ No newline at end of file + +makePathArray = make_path_array diff --git a/src/Mod/Draft/draftmake/make_point.py b/src/Mod/Draft/draftmake/make_point.py index 2654734207..a7e1002a71 100644 --- a/src/Mod/Draft/draftmake/make_point.py +++ b/src/Mod/Draft/draftmake/make_point.py @@ -93,4 +93,4 @@ def make_point(X=0, Y=0, Z=0, color=None, name = "Point", point_size= 5): return obj -makePoint = make_point \ No newline at end of file +makePoint = make_point diff --git a/src/Mod/Draft/draftmake/make_pointarray.py b/src/Mod/Draft/draftmake/make_pointarray.py index 35ac994da4..728bbb8eea 100644 --- a/src/Mod/Draft/draftmake/make_pointarray.py +++ b/src/Mod/Draft/draftmake/make_pointarray.py @@ -63,4 +63,4 @@ def make_point_array(base, ptlst): return obj -makePointArray = make_point_array \ No newline at end of file +makePointArray = make_point_array diff --git a/src/Mod/Draft/draftmake/make_polygon.py b/src/Mod/Draft/draftmake/make_polygon.py index 9e6a178dea..90665cc1b6 100644 --- a/src/Mod/Draft/draftmake/make_polygon.py +++ b/src/Mod/Draft/draftmake/make_polygon.py @@ -88,4 +88,4 @@ def make_polygon(nfaces, radius=1, inscribed=True, placement=None, face=None, su return obj -makePolygon = make_polygon \ No newline at end of file +makePolygon = make_polygon diff --git a/src/Mod/Draft/draftmake/make_rectangle.py b/src/Mod/Draft/draftmake/make_rectangle.py index af4f344191..a181c46071 100644 --- a/src/Mod/Draft/draftmake/make_rectangle.py +++ b/src/Mod/Draft/draftmake/make_rectangle.py @@ -82,4 +82,4 @@ def make_rectangle(length, height, placement=None, face=None, support=None): return obj -makeRectangle = make_rectangle \ No newline at end of file +makeRectangle = make_rectangle diff --git a/src/Mod/Draft/draftmake/make_shape2dview.py b/src/Mod/Draft/draftmake/make_shape2dview.py index 01b732316c..f42128c571 100644 --- a/src/Mod/Draft/draftmake/make_shape2dview.py +++ b/src/Mod/Draft/draftmake/make_shape2dview.py @@ -68,4 +68,4 @@ def make_shape2dview(baseobj,projectionVector=None,facenumbers=[]): return obj -makeShape2DView = make_shape2dview \ No newline at end of file +makeShape2DView = make_shape2dview diff --git a/src/Mod/Draft/draftmake/make_shapestring.py b/src/Mod/Draft/draftmake/make_shapestring.py index da407fd755..24f04d5572 100644 --- a/src/Mod/Draft/draftmake/make_shapestring.py +++ b/src/Mod/Draft/draftmake/make_shapestring.py @@ -69,4 +69,4 @@ def make_shapestring(String, FontFile, Size=100, Tracking=0): return obj -makeShapeString = make_shapestring \ No newline at end of file +makeShapeString = make_shapestring diff --git a/src/Mod/Draft/draftmake/make_sketch.py b/src/Mod/Draft/draftmake/make_sketch.py index 343e60a1d3..ef617eeb2d 100644 --- a/src/Mod/Draft/draftmake/make_sketch.py +++ b/src/Mod/Draft/draftmake/make_sketch.py @@ -333,4 +333,4 @@ def make_sketch(objectslist, autoconstraints=False, addTo=None, return nobj -makeSketch = make_sketch \ No newline at end of file +makeSketch = make_sketch diff --git a/src/Mod/Draft/draftmake/make_wire.py b/src/Mod/Draft/draftmake/make_wire.py index f84ad5e095..5e725c9357 100644 --- a/src/Mod/Draft/draftmake/make_wire.py +++ b/src/Mod/Draft/draftmake/make_wire.py @@ -120,4 +120,4 @@ def make_wire(pointslist, closed=False, placement=None, face=None, support=None, return obj -makeWire = make_wire \ No newline at end of file +makeWire = make_wire diff --git a/src/Mod/Draft/draftmake/make_wpproxy.py b/src/Mod/Draft/draftmake/make_wpproxy.py index 78942f2c7b..2c24d587b0 100644 --- a/src/Mod/Draft/draftmake/make_wpproxy.py +++ b/src/Mod/Draft/draftmake/make_wpproxy.py @@ -55,4 +55,4 @@ def make_workingplaneproxy(placement): return obj -makeWorkingPlaneProxy = make_workingplaneproxy \ No newline at end of file +makeWorkingPlaneProxy = make_workingplaneproxy diff --git a/src/Mod/Draft/draftobjects/array.py b/src/Mod/Draft/draftobjects/array.py index 8521b1025d..94349aebac 100644 --- a/src/Mod/Draft/draftobjects/array.py +++ b/src/Mod/Draft/draftobjects/array.py @@ -184,7 +184,6 @@ class Array(DraftLink): return super(Array, self).buildShape(obj, pl, pls) def rectArray(self,pl,xvector,yvector,zvector,xnum,ynum,znum): - import Part base = [pl.copy()] for xcount in range(xnum): currentxvector=App.Vector(xvector).multiply(xcount) @@ -209,7 +208,6 @@ class Array(DraftLink): return base def circArray(self,pl,rdist,tdist,axis,center,cnum,sym): - import Part sym = max(1, sym) lead = (0,1,0) if axis.x == 0 and axis.z == 0: lead = (1,0,0) @@ -232,7 +230,6 @@ class Array(DraftLink): def polarArray(self,spl,center,angle,num,axis,axisvector): #print("angle ",angle," num ",num) - import Part spin = App.Placement(App.Vector(), spl.Rotation) pl = App.Placement(spl.Base, App.Rotation()) center = center.sub(spl.Base) @@ -257,4 +254,4 @@ class Array(DraftLink): return base -_Array = Array \ No newline at end of file +_Array = Array diff --git a/src/Mod/Draft/draftobjects/base.py b/src/Mod/Draft/draftobjects/base.py index 1674f1e6e4..fab8375b47 100644 --- a/src/Mod/Draft/draftobjects/base.py +++ b/src/Mod/Draft/draftobjects/base.py @@ -152,4 +152,4 @@ class DraftObject(object): pass -_DraftObject = DraftObject \ No newline at end of file +_DraftObject = DraftObject diff --git a/src/Mod/Draft/draftobjects/bezcurve.py b/src/Mod/Draft/draftobjects/bezcurve.py index b091aa6f07..ecd17a4cf4 100644 --- a/src/Mod/Draft/draftobjects/bezcurve.py +++ b/src/Mod/Draft/draftobjects/bezcurve.py @@ -193,4 +193,4 @@ class BezCurve(DraftObject): return pn + knot -_BezCurve = BezCurve \ No newline at end of file +_BezCurve = BezCurve diff --git a/src/Mod/Draft/draftobjects/block.py b/src/Mod/Draft/draftobjects/block.py index 323152cd48..3878fcc65d 100644 --- a/src/Mod/Draft/draftobjects/block.py +++ b/src/Mod/Draft/draftobjects/block.py @@ -53,4 +53,4 @@ class Block(DraftObject): obj.Placement = plm obj.positionBySupport() -_Block = Block \ No newline at end of file +_Block = Block diff --git a/src/Mod/Draft/draftobjects/bspline.py b/src/Mod/Draft/draftobjects/bspline.py index b2874dce2f..b7cdcd26d1 100644 --- a/src/Mod/Draft/draftobjects/bspline.py +++ b/src/Mod/Draft/draftobjects/bspline.py @@ -133,4 +133,4 @@ class BSpline(DraftObject): obj.positionBySupport() -_BSpline = BSpline \ No newline at end of file +_BSpline = BSpline diff --git a/src/Mod/Draft/draftobjects/circle.py b/src/Mod/Draft/draftobjects/circle.py index 2762a37994..ff6b47c984 100644 --- a/src/Mod/Draft/draftobjects/circle.py +++ b/src/Mod/Draft/draftobjects/circle.py @@ -95,4 +95,4 @@ class Circle(DraftObject): obj.positionBySupport() -_Circle = Circle \ No newline at end of file +_Circle = Circle diff --git a/src/Mod/Draft/draftobjects/clone.py b/src/Mod/Draft/draftobjects/clone.py index 0bb9d5349d..a41c418703 100644 --- a/src/Mod/Draft/draftobjects/clone.py +++ b/src/Mod/Draft/draftobjects/clone.py @@ -128,4 +128,4 @@ class Clone(DraftObject): return None -_Clone = Clone \ No newline at end of file +_Clone = Clone diff --git a/src/Mod/Draft/draftobjects/dimension.py b/src/Mod/Draft/draftobjects/dimension.py index 1f7fbcdad8..33cdb46a8e 100644 --- a/src/Mod/Draft/draftobjects/dimension.py +++ b/src/Mod/Draft/draftobjects/dimension.py @@ -401,5 +401,3 @@ class AngularDimension(DimensionBase): obj.setEditorMode('Normal',2) if hasattr(obj,"Support"): obj.setEditorMode('Support',2) - - diff --git a/src/Mod/Draft/draftobjects/draftlink.py b/src/Mod/Draft/draftobjects/draftlink.py index 24f1a95924..32e4891a4f 100644 --- a/src/Mod/Draft/draftobjects/draftlink.py +++ b/src/Mod/Draft/draftobjects/draftlink.py @@ -38,9 +38,9 @@ from draftobjects.base import DraftObject class DraftLink(DraftObject): """ Documentation needed. - I guess the DraftLink was introduced by Realthunder to allow - the use of new App::Link object into Draft Array objects during - the development of version 0.19. + DraftLink was introduced by Realthunder to allow the use of new + App::Link object into Draft Array objects during version 0.19 development + cycle. """ def __init__(self,obj,tp): @@ -177,4 +177,4 @@ class DraftLink(DraftObject): '-Immutable' if obj.ExpandArray else 'Immutable') -_DraftLink = DraftLink \ No newline at end of file +_DraftLink = DraftLink diff --git a/src/Mod/Draft/draftobjects/drawingview.py b/src/Mod/Draft/draftobjects/drawingview.py index c6276056c9..80ddc27b59 100644 --- a/src/Mod/Draft/draftobjects/drawingview.py +++ b/src/Mod/Draft/draftobjects/drawingview.py @@ -21,6 +21,7 @@ # * * # *************************************************************************** """This module provides the object code for the Draft DrawingView object. +This module is obsolete, since Drawing was substituted by TechDraw. """ ## @package drawingview # \ingroup DRAFT @@ -34,8 +35,7 @@ import FreeCAD as App import DraftVecUtils -import getSVG as svg -getSVG = svg.getSVG +from getSVG import getSVG import draftutils.utils as utils @@ -45,7 +45,7 @@ from draftobjects.base import DraftObject class DrawingView(DraftObject): """The Draft DrawingView object - TODO: this class is obsolete, since Drawing was substituted by TechDraw. + OBSOLETE: this class is obsolete, since Drawing was substituted by TechDraw. """ def __init__(self, obj): @@ -138,4 +138,4 @@ class DrawingView(DraftObject): return utils.getDXF(obj) -_DrawingView = DrawingView \ No newline at end of file +_DrawingView = DrawingView diff --git a/src/Mod/Draft/draftobjects/ellipse.py b/src/Mod/Draft/draftobjects/ellipse.py index 7b93bf2636..ef34f877ec 100644 --- a/src/Mod/Draft/draftobjects/ellipse.py +++ b/src/Mod/Draft/draftobjects/ellipse.py @@ -99,4 +99,4 @@ class Ellipse(DraftObject): obj.positionBySupport() -_Ellipse = Ellipse \ No newline at end of file +_Ellipse = Ellipse diff --git a/src/Mod/Draft/draftobjects/facebinder.py b/src/Mod/Draft/draftobjects/facebinder.py index 57610cce86..fc7ff52267 100644 --- a/src/Mod/Draft/draftobjects/facebinder.py +++ b/src/Mod/Draft/draftobjects/facebinder.py @@ -123,4 +123,4 @@ class Facebinder(DraftObject): self.execute(obj) -_Facebinder = Facebinder \ No newline at end of file +_Facebinder = Facebinder diff --git a/src/Mod/Draft/draftobjects/label.py b/src/Mod/Draft/draftobjects/label.py index 1998550455..b3a3cb3aff 100644 --- a/src/Mod/Draft/draftobjects/label.py +++ b/src/Mod/Draft/draftobjects/label.py @@ -238,4 +238,4 @@ class Label(DraftAnnotation): def onChanged(self,obj,prop): '''Do something when a property has changed''' - return \ No newline at end of file + return diff --git a/src/Mod/Draft/draftobjects/point.py b/src/Mod/Draft/draftobjects/point.py index d73cd4afb4..385ac7471e 100644 --- a/src/Mod/Draft/draftobjects/point.py +++ b/src/Mod/Draft/draftobjects/point.py @@ -74,4 +74,4 @@ class Point(DraftObject): obj.Z.Value) -_Point = Point \ No newline at end of file +_Point = Point diff --git a/src/Mod/Draft/draftobjects/pointarray.py b/src/Mod/Draft/draftobjects/pointarray.py index b63761fd83..5de8e7a181 100644 --- a/src/Mod/Draft/draftobjects/pointarray.py +++ b/src/Mod/Draft/draftobjects/pointarray.py @@ -104,4 +104,4 @@ class PointArray(DraftObject): obj.Shape = obj.Base.Shape.copy() -_PointArray = PointArray \ No newline at end of file +_PointArray = PointArray diff --git a/src/Mod/Draft/draftobjects/polygon.py b/src/Mod/Draft/draftobjects/polygon.py index 1d6e1810cf..2576fa8ca2 100644 --- a/src/Mod/Draft/draftobjects/polygon.py +++ b/src/Mod/Draft/draftobjects/polygon.py @@ -119,4 +119,4 @@ class Polygon(DraftObject): obj.positionBySupport() -_Polygon = Polygon \ No newline at end of file +_Polygon = Polygon diff --git a/src/Mod/Draft/draftobjects/rectangle.py b/src/Mod/Draft/draftobjects/rectangle.py index fbbea335e7..325f085891 100644 --- a/src/Mod/Draft/draftobjects/rectangle.py +++ b/src/Mod/Draft/draftobjects/rectangle.py @@ -177,4 +177,4 @@ class Rectangle(DraftObject): obj.positionBySupport() -_Rectangle = Rectangle \ No newline at end of file +_Rectangle = Rectangle diff --git a/src/Mod/Draft/draftobjects/shape2dview.py b/src/Mod/Draft/draftobjects/shape2dview.py index 8e25ce1dd4..7d3d525448 100644 --- a/src/Mod/Draft/draftobjects/shape2dview.py +++ b/src/Mod/Draft/draftobjects/shape2dview.py @@ -269,4 +269,4 @@ class Shape2DView(DraftObject): obj.Placement = pl -_Shape2DView = Shape2DView \ No newline at end of file +_Shape2DView = Shape2DView diff --git a/src/Mod/Draft/draftobjects/shapestring.py b/src/Mod/Draft/draftobjects/shapestring.py index 64ee1cb1ae..325ef44f28 100644 --- a/src/Mod/Draft/draftobjects/shapestring.py +++ b/src/Mod/Draft/draftobjects/shapestring.py @@ -200,4 +200,4 @@ class ShapeString(DraftObject): return ret -_ShapeString = ShapeString \ No newline at end of file +_ShapeString = ShapeString diff --git a/src/Mod/Draft/draftobjects/wire.py b/src/Mod/Draft/draftobjects/wire.py index 466a10348c..5d69af6019 100644 --- a/src/Mod/Draft/draftobjects/wire.py +++ b/src/Mod/Draft/draftobjects/wire.py @@ -248,4 +248,4 @@ class Wire(DraftObject): obj.End = displayfpend -_Wire = Wire \ No newline at end of file +_Wire = Wire diff --git a/src/Mod/Draft/draftobjects/wpproxy.py b/src/Mod/Draft/draftobjects/wpproxy.py index c7bdd951e0..b5c94eae78 100644 --- a/src/Mod/Draft/draftobjects/wpproxy.py +++ b/src/Mod/Draft/draftobjects/wpproxy.py @@ -72,4 +72,4 @@ class WorkingPlaneProxy: def __setstate__(self,state): if state: - self.Type = state \ No newline at end of file + self.Type = state diff --git a/src/Mod/Draft/draftviewproviders/view_array.py b/src/Mod/Draft/draftviewproviders/view_array.py index e23802925a..18a7b28540 100644 --- a/src/Mod/Draft/draftviewproviders/view_array.py +++ b/src/Mod/Draft/draftviewproviders/view_array.py @@ -72,4 +72,4 @@ class ViewProviderDraftArray(ViewProviderDraft): vobj.DiffuseColor = colors -_ViewProviderDraftArray = ViewProviderDraftArray \ No newline at end of file +_ViewProviderDraftArray = ViewProviderDraftArray diff --git a/src/Mod/Draft/draftviewproviders/view_base.py b/src/Mod/Draft/draftviewproviders/view_base.py index 287740678a..e9b9d6b969 100644 --- a/src/Mod/Draft/draftviewproviders/view_base.py +++ b/src/Mod/Draft/draftviewproviders/view_base.py @@ -524,4 +524,4 @@ class ViewProviderDraftPart(ViewProviderDraftAlt): return ":/icons/Tree_Part.svg" -_ViewProviderDraftPart = ViewProviderDraftPart \ No newline at end of file +_ViewProviderDraftPart = ViewProviderDraftPart diff --git a/src/Mod/Draft/draftviewproviders/view_clone.py b/src/Mod/Draft/draftviewproviders/view_clone.py index 9ddc4a443b..da7c1a48aa 100644 --- a/src/Mod/Draft/draftviewproviders/view_clone.py +++ b/src/Mod/Draft/draftviewproviders/view_clone.py @@ -77,4 +77,4 @@ class ViewProviderClone: vobj.DiffuseColor = colors -_ViewProviderClone = ViewProviderClone \ No newline at end of file +_ViewProviderClone = ViewProviderClone diff --git a/src/Mod/Draft/draftviewproviders/view_draft_annotation.py b/src/Mod/Draft/draftviewproviders/view_draft_annotation.py index 4f386a8686..bb43fe1478 100644 --- a/src/Mod/Draft/draftviewproviders/view_draft_annotation.py +++ b/src/Mod/Draft/draftviewproviders/view_draft_annotation.py @@ -114,5 +114,3 @@ class ViewProviderDraftAnnotation(object): if hasattr(self.Object,"Group"): objs.extend(self.Object.Group) return objs - - diff --git a/src/Mod/Draft/draftviewproviders/view_draftlink.py b/src/Mod/Draft/draftviewproviders/view_draftlink.py index 2a286efa97..3175992bdf 100644 --- a/src/Mod/Draft/draftviewproviders/view_draftlink.py +++ b/src/Mod/Draft/draftviewproviders/view_draftlink.py @@ -68,4 +68,4 @@ class ViewProviderDraftLink: return obj.ElementList -_ViewProviderDraftLink = ViewProviderDraftLink \ No newline at end of file +_ViewProviderDraftLink = ViewProviderDraftLink diff --git a/src/Mod/Draft/draftviewproviders/view_facebinder.py b/src/Mod/Draft/draftviewproviders/view_facebinder.py index e339d060e8..dadd5482da 100644 --- a/src/Mod/Draft/draftviewproviders/view_facebinder.py +++ b/src/Mod/Draft/draftviewproviders/view_facebinder.py @@ -53,4 +53,4 @@ class ViewProviderFacebinder(ViewProviderDraft): return False -_ViewProviderFacebinder = ViewProviderFacebinder \ No newline at end of file +_ViewProviderFacebinder = ViewProviderFacebinder diff --git a/src/Mod/Draft/draftviewproviders/view_label.py b/src/Mod/Draft/draftviewproviders/view_label.py index 8f48ac063e..e88783a8a4 100644 --- a/src/Mod/Draft/draftviewproviders/view_label.py +++ b/src/Mod/Draft/draftviewproviders/view_label.py @@ -319,4 +319,4 @@ class ViewProviderLabel(ViewProviderDraftAnnotation): v = vobj.Object.Placement.Rotation.multVec(v) pos = vobj.Object.Placement.Base.add(v) self.textpos.translation.setValue(pos) - self.textpos.rotation.setValue(vobj.Object.Placement.Rotation.Q) \ No newline at end of file + self.textpos.rotation.setValue(vobj.Object.Placement.Rotation.Q) diff --git a/src/Mod/Draft/draftviewproviders/view_point.py b/src/Mod/Draft/draftviewproviders/view_point.py index c75ed1f18e..0c8d9b0c94 100644 --- a/src/Mod/Draft/draftviewproviders/view_point.py +++ b/src/Mod/Draft/draftviewproviders/view_point.py @@ -52,4 +52,4 @@ class ViewProviderPoint(ViewProviderDraft): return ":/icons/Draft_Dot.svg" -_ViewProviderPoint = ViewProviderPoint \ No newline at end of file +_ViewProviderPoint = ViewProviderPoint diff --git a/src/Mod/Draft/draftviewproviders/view_rectangle.py b/src/Mod/Draft/draftviewproviders/view_rectangle.py index 35faed7ee5..51dfd56d5d 100644 --- a/src/Mod/Draft/draftviewproviders/view_rectangle.py +++ b/src/Mod/Draft/draftviewproviders/view_rectangle.py @@ -41,4 +41,4 @@ class ViewProviderRectangle(ViewProviderDraft): "Draft", QT_TRANSLATE_NOOP("App::Property", _tip)) -_ViewProviderRectangle = ViewProviderRectangle \ No newline at end of file +_ViewProviderRectangle = ViewProviderRectangle