diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 8f02c77fd..c9022417c 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -544,7 +544,7 @@ def makeBlock(objectslist): select(obj) return obj -def makeArray(baseobject,arg1=Vector(0,0,0),arg2=360,arg3=4,arg4=None): +def makeArray(baseobject,arg1,arg2,arg3,arg4=None): '''makeArray(object,xvector,yvector,xnum,ynum) for rectangular array, or makeArray(object,center,totalangle,totalnum) for polar array: Creates an array of the given object @@ -558,7 +558,7 @@ def makeArray(baseobject,arg1=Vector(0,0,0),arg2=360,arg3=4,arg4=None): _ViewProviderArray(obj.ViewObject) obj.Base = baseobject if arg4: - org.ArrayType = "ortho" + obj.ArrayType = "ortho" obj.IntervalX = arg1 obj.IntervalY = arg2 obj.NumberX = arg3 diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index 269933485..76cea71ce 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -194,7 +194,8 @@ class DraftWorkbench (Workbench): "Draft_DelPoint","Draft_Shape2DView","Draft_Draft2Sketch","Draft_Array"] self.treecmdList = ["Draft_ApplyStyle","Draft_ToggleDisplayMode","Draft_AddToGroup","Draft_SelectGroup"] self.lineList = ["Draft_UndoLine","Draft_FinishLine","Draft_CloseLine"] - self.appendToolbar(str(draftTools.translate("draft","Draft tools")),self.cmdList+self.modList) + self.appendToolbar(str(draftTools.translate("draft","Draft creation tools")),self.cmdList) + self.appendToolbar(str(draftTools.translate("draft","Draft modification tools")),self.modList) self.appendMenu(str(draftTools.translate("draft","Draft")),self.cmdList+self.modList) self.appendMenu([str(draftTools.translate("draft","Draft")),str(draftTools.translate("draft","Display options"))],self.treecmdList) self.appendMenu([str(draftTools.translate("draft","Draft")),str(draftTools.translate("draft","Wire tools"))],self.lineList) diff --git a/src/Mod/Draft/draftTools.py b/src/Mod/Draft/draftTools.py index 76180c649..64ba541e2 100755 --- a/src/Mod/Draft/draftTools.py +++ b/src/Mod/Draft/draftTools.py @@ -4491,7 +4491,7 @@ class Array(): def Activated(self): obj = Draft.getSelection()[0] FreeCAD.ActiveDocument.openTransaction("Array") - Draft.makeArray(obj) + Draft.makeArray(obj,Vector(1,0,0),Vector(0,1,0),2,2) FreeCAD.ActiveDocument.commitTransaction() #---------------------------------------------------------------------------