Draft: Housekeeping: call 'make' functions with new name

This commit is contained in:
Roy
2022-02-10 16:44:37 +01:00
parent 092afacfcb
commit 6b808987ad
8 changed files with 79 additions and 80 deletions

View File

@@ -34,12 +34,11 @@ import DraftVecUtils
import draftutils.gui_utils as gui_utils
import draftutils.utils as utils
from draftmake.make_copy import make_copy
from draftmake.make_rectangle import makeRectangle
from draftmake.make_wire import makeWire
from draftmake.make_polygon import makePolygon
from draftmake.make_circle import makeCircle
from draftmake.make_bspline import makeBSpline
from draftmake.make_rectangle import make_rectangle
from draftmake.make_wire import make_wire
from draftmake.make_polygon import make_polygon
from draftmake.make_circle import make_circle
from draftmake.make_bspline import make_bspline
def offset(obj, delta, copy=False, bind=False, sym=False, occ=False):
@@ -164,7 +163,7 @@ def offset(obj, delta, copy=False, bind=False, sym=False, occ=False):
if sym: return None
if utils.get_type(obj) == "Wire":
if p:
newobj = makeWire(p)
newobj = make_wire(p)
newobj.Closed = obj.Closed
elif newwire:
newobj = App.ActiveDocument.addObject("Part::Feature","Offset")
@@ -174,7 +173,7 @@ def offset(obj, delta, copy=False, bind=False, sym=False, occ=False):
elif utils.get_type(obj) == "Rectangle":
if p:
length,height,plac = getRect(p,obj)
newobj = makeRectangle(length,height,plac)
newobj = make_rectangle(length,height,plac)
elif newwire:
newobj = App.ActiveDocument.addObject("Part::Feature","Offset")
newobj.Shape = newwire
@@ -182,24 +181,24 @@ def offset(obj, delta, copy=False, bind=False, sym=False, occ=False):
print("Draft.offset: Unable to duplicate this object")
elif utils.get_type(obj) == "Circle":
pl = obj.Placement
newobj = makeCircle(delta)
newobj = make_circle(delta)
newobj.FirstAngle = obj.FirstAngle
newobj.LastAngle = obj.LastAngle
newobj.Placement = pl
elif utils.get_type(obj) == "Polygon":
pl = obj.Placement
newobj = makePolygon(obj.FacesNumber)
newobj = make_polygon(obj.FacesNumber)
newobj.Radius = getRadius(obj,delta)
newobj.DrawMode = obj.DrawMode
newobj.Placement = pl
elif utils.get_type(obj) == "BSpline":
newobj = makeBSpline(delta)
newobj = make_bspline(delta)
newobj.Closed = obj.Closed
else:
# try to offset anyway
try:
if p:
newobj = makeWire(p)
newobj = make_wire(p)
newobj.Closed = obj.Shape.isClosed()
except Part.OCCError:
pass