electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make polar and circular arrays aware of the active working plane (#28324)

Browse Source
This commit is contained in:
Turan Furkan Topak
2026-03-14 15:18:00 +03:00
committed by GitHub
parent df8c6b5db9
commit d90c88f0fc
4 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mod/Draft/draftmake/make_circulararray.py
+10 -2
View File
@@ -30,6 +30,7 @@
## \addtogroup draftmake
# @{
import FreeCAD as App
import WorkingPlane
import draftmake.make_array as make_array
import draftutils.utils as utils
@@ -43,7 +44,7 @@ def make_circular_array(
tan_distance=50,
number=3,
symmetry=1,
axis=App.Vector(0, 0, 1),
axis=None,
center=App.Vector(0, 0, 0),
use_link=True,
):
@@ -88,7 +89,8 @@ def make_circular_array(
Et cetera.
axis: Base::Vector3, optional
It defaults to `App.Vector(0, 0, 1)` or the `+Z` axis.
It defaults to the active Draft working plane axis if available,
otherwise to `App.Vector(0, 0, 1)` or the `+Z` axis.
The unit vector indicating the axis of rotation.
center: Base::Vector3, optional
@@ -150,6 +152,12 @@ def make_circular_array(
_err(translate("draft", "Wrong input: must be an integer number."))
return None
if axis is None:
if App.GuiUp:
axis = WorkingPlane.get_working_plane(update=False).axis
else:
axis = App.Vector(0, 0, 1)
try:
utils.type_check([(axis, App.Vector), (center, App.Vector)], name=_name)
except TypeError:
src/Mod/Draft/draftmake/make_polararray.py
+22 -2
View File
@@ -30,6 +30,7 @@
## \addtogroup draftmake
# @{
import FreeCAD as App
import WorkingPlane
import draftutils.utils as utils
import draftmake.make_array as make_array
@@ -37,7 +38,14 @@ from draftutils.messages import _err
from draftutils.translate import translate
def make_polar_array(base_object, number=5, angle=360, center=App.Vector(0, 0, 0), use_link=True):
def make_polar_array(
base_object,
number=5,
angle=360,
center=App.Vector(0, 0, 0),
axis=None,
use_link=True,
):
"""Create a polar array from the given object.
Parameters
@@ -61,6 +69,11 @@ def make_polar_array(base_object, number=5, angle=360, center=App.Vector(0, 0, 0
It defaults to the origin `App.Vector(0, 0, 0)`.
The vector indicating the center of rotation of the array.
axis: Base::Vector3, optional
It defaults to the active Draft working plane axis if available,
otherwise to `App.Vector(0, 0, 1)` or the `+Z` axis.
The unit vector indicating the axis of rotation.
use_link: bool, optional
It defaults to `True`.
If it is `True` the produced copies are not `Part::TopoShape` copies,
@@ -109,8 +122,14 @@ def make_polar_array(base_object, number=5, angle=360, center=App.Vector(0, 0, 0
_err(translate("draft", "Wrong input: must be a number."))
return None
if axis is None:
if App.GuiUp:
axis = WorkingPlane.get_working_plane(update=False).axis
else:
axis = App.Vector(0, 0, 1)
try:
utils.type_check([(center, App.Vector)], name=_name)
utils.type_check([(center, App.Vector), (axis, App.Vector)], name=_name)
except TypeError:
_err(translate("draft", "Wrong input: must be a vector."))
return None
@@ -119,6 +138,7 @@ def make_polar_array(base_object, number=5, angle=360, center=App.Vector(0, 0, 0
new_obj = make_array.make_array(
base_object, arg1=center, arg2=angle, arg3=number, use_link=use_link
)
new_obj.Axis = axis
return new_obj
src/Mod/Draft/drafttaskpanels/task_circulararray.py
+2 -1
View File
@@ -34,6 +34,7 @@ from PySide.QtCore import QT_TRANSLATE_NOOP
import FreeCAD as App
import FreeCADGui as Gui
import WorkingPlane
import Draft_rc # include resources, icons, ui files
import DraftVecUtils
from FreeCAD import Units as U
@@ -97,7 +98,7 @@ class TaskPanelCircularArray:
self.center = App.Vector()
# TODO: the axis is currently fixed, it should be editable
# or selectable from the task panel
self.axis = App.Vector(0, 0, 1)
self.axis = WorkingPlane.get_working_plane(update=False).axis
self.r_distance = 100
self.tan_distance = 50
self.number = 3
src/Mod/Draft/drafttaskpanels/task_polararray.py
+20 -4
View File
@@ -34,6 +34,7 @@ from PySide.QtCore import QT_TRANSLATE_NOOP
import FreeCAD as App
import FreeCADGui as Gui
import WorkingPlane
import Draft_rc # include resources, icons, ui files
import DraftVecUtils
from FreeCAD import Units as U
@@ -95,6 +96,9 @@ class TaskPanelPolarArray:
# -------------------------------------------------------------------
# Default values for the internal function, and for the task panel interface
self.center = App.Vector()
# TODO: the axis is currently fixed, it should be editable
# or selectable from the task panel
self.axis = WorkingPlane.get_working_plane(update=False).axis
self.angle = 360
self.number = 5
self.fuse = params.get_param("Draft_array_fuse")
@@ -144,16 +148,19 @@ class TaskPanelPolarArray:
(self.number, self.angle) = self.get_number_angle()
self.axis = self.get_axis()
self.center = self.get_center()
self.valid_input = self.validate_input(self.selection, self.number, self.angle, self.center)
self.valid_input = self.validate_input(
self.selection, self.number, self.angle, self.axis, self.center
)
if self.valid_input:
self.create_object()
# The internal function already displays messages
# self.print_messages()
self.finish()
def validate_input(self, selection, number, angle, center):
def validate_input(self, selection, number, angle, axis, center):
"""Check that the input is valid.
Some values may not need to be checked because
@@ -191,7 +198,7 @@ class TaskPanelPolarArray:
self.angle = -360
# The other arguments are not tested but they should be present.
if center:
if axis and center:
pass
self.fuse = self.form.checkbox_fuse.isChecked()
@@ -216,7 +223,7 @@ class TaskPanelPolarArray:
# This creates the object immediately
# obj = Draft.make_polar_array(sel_obj,
# self.number, self.angle, self.center,
# self.use_link)
# self.axis, self.use_link)
# Instead, we build the commands to execute through the caller
# of this class, the GuiCommand.
@@ -228,6 +235,7 @@ class TaskPanelPolarArray:
_cmd += "number=" + str(self.number) + ", "
_cmd += "angle=" + str(self.angle) + ", "
_cmd += "center=" + DraftVecUtils.toString(self.center) + ", "
_cmd += "axis=" + DraftVecUtils.toString(self.axis) + ", "
_cmd += "use_link=" + str(self.use_link)
_cmd += ")"
@@ -259,6 +267,14 @@ class TaskPanelPolarArray:
center = App.Vector(_quantity(c_x_str), _quantity(c_y_str), _quantity(c_z_str))
return center
def get_axis(self):
"""Get the axis that will be used for the array. NOT IMPLEMENTED.
It should consider a second selection of an edge or wire to use
as an axis.
"""
return self.axis
def reset_point(self):
"""Reset the center point to the original distance."""
self.form.input_c_x.setProperty("rawValue", 0)