kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #12230 from kpemartin/Issue11876

Browse Source 
Remove excessive output from Draft object creation and editing
This commit is contained in:
Roy-043
2024-02-02 18:06:02 +01:00
committed by GitHub
parent cfe13dc0c3 39bee92bea
commit ee3e1cd5ce
38 changed files with 65 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Draft/draftmake/make_arc_3points.py
View File

@@ -33,7 +33,7 @@ import FreeCAD as App
import Part
import Draft
import draftutils.utils as utils
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
import draftutils.gui_utils as gui_utils
@@ -117,7 +117,6 @@ def make_arc_3points(points, placement=None, face=False,
Returns `None` if there is a problem and the object cannot be created.
"""
_name = "make_arc_3points"
utils.print_header(_name, "Arc by 3 points")
try:
utils.type_check([(points, (list, tuple))], name=_name)
@@ -141,10 +140,6 @@ def make_arc_3points(points, placement=None, face=False,
p1, p2, p3 = points
_msg("p1: {}".format(p1))
_msg("p2: {}".format(p2))
_msg("p3: {}".format(p3))
try:
utils.type_check([(p1, App.Vector),
(p2, App.Vector),
@@ -163,11 +158,7 @@ def make_arc_3points(points, placement=None, face=False,
radius = edge.Curve.Radius
center = edge.Curve.Center
_msg(translate("draft","Radius:") + " " + "{}".format(radius))
_msg(translate("draft","Center:") + " " + "{}".format(center))
if primitive:
_msg(translate("draft","Create primitive object"))
obj = App.ActiveDocument.addObject("Part::Feature", "Arc")
obj.Shape = edge
return obj
@@ -190,18 +181,11 @@ def make_arc_3points(points, placement=None, face=False,
if placement and not support:
obj.Placement.Base = placement.Base
_msg(translate("draft","Final placement:") + " " + "{}".format(obj.Placement))
if face:
_msg(translate("draft","Face: True"))
if support:
_msg(translate("draft","Support:") + " " + "{}".format(support))
_msg(translate("draft","Map mode:") + " " + "{}".format(map_mode))
obj.MapMode = map_mode
if placement:
obj.AttachmentOffset.Base = placement.Base
obj.AttachmentOffset.Rotation = original_placement.Rotation
_msg(translate("draft","Attachment offset: {}".format(obj.AttachmentOffset)))
_msg(translate("draft","Final placement:") + " " + "{}".format(obj.Placement))
return obj

18
src/Mod/Draft/draftmake/make_circulararray.py
View File

@@ -31,7 +31,7 @@ import FreeCAD as App
import draftmake.make_array as make_array
import draftutils.utils as utils
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
@@ -119,7 +119,6 @@ def make_circular_array(base_object,
make_ortho_array, make_polar_array, make_path_array, make_point_array
"""
_name = "make_circular_array"
utils.print_header(_name, translate("draft","Circular array"))
if isinstance(base_object, str):
base_object_str = base_object
@@ -127,15 +126,9 @@ def make_circular_array(base_object,
found, base_object = utils.find_object(base_object,
doc=App.activeDocument())
if not found:
_msg("base_object: {}".format(base_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: base_object {} not in document.").format(base_object_str))
return None
_msg("base_object: {}".format(base_object.Label))
_msg("r_distance: {}".format(r_distance))
_msg("tan_distance: {}".format(tan_distance))
try:
utils.type_check([(r_distance, (int, float, App.Units.Quantity)),
(tan_distance, (int, float, App.Units.Quantity))],
@@ -144,9 +137,6 @@ def make_circular_array(base_object,
_err(translate("draft","Wrong input: must be a number or quantity."))
return None
_msg("number: {}".format(number))
_msg("symmetry: {}".format(symmetry))
try:
utils.type_check([(number, int),
(symmetry, int)], name=_name)
@@ -154,9 +144,6 @@ def make_circular_array(base_object,
_err(translate("draft","Wrong input: must be an integer number."))
return None
_msg("axis: {}".format(axis))
_msg("center: {}".format(center))
try:
utils.type_check([(axis, App.Vector),
(center, App.Vector)], name=_name)
@@ -165,7 +152,6 @@ def make_circular_array(base_object,
return None
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
new_obj = make_array.make_array(base_object,
arg1=r_distance, arg2=tan_distance,

30
src/Mod/Draft/draftmake/make_dimension.py
View File

@@ -40,7 +40,7 @@ import WorkingPlane
from draftutils import gui_utils
from draftutils import utils
from draftutils.messages import _msg, _wrn, _err
from draftutils.messages import _wrn, _err
from draftutils.translate import translate
from draftobjects.dimension import LinearDimension, AngularDimension
@@ -206,28 +206,24 @@ def make_linear_dimension(p1, p2, dim_line=None):
If there is a problem it will return `None`.
"""
_name = "make_linear_dimension"
utils.print_header(_name, "Linear dimension")
found, doc = utils.find_doc(App.activeDocument())
if not found:
_err(translate("draft","No active document. Aborting."))
return None
_msg("p1: {}".format(p1))
try:
utils.type_check([(p1, App.Vector)], name=_name)
except TypeError:
_err(translate("draft","Wrong input: must be a vector."))
return None
_msg("p2: {}".format(p2))
try:
utils.type_check([(p2, App.Vector)], name=_name)
except TypeError:
_err(translate("draft","Wrong input: must be a vector."))
return None
_msg("dim_line: {}".format(dim_line))
if dim_line:
try:
utils.type_check([(dim_line, App.Vector)], name=_name)
@@ -299,7 +295,6 @@ def make_linear_dimension_obj(edge_object, i1=1, i2=2, dim_line=None):
If there is a problem it will return `None`.
"""
_name = "make_linear_dimension_obj"
utils.print_header(_name, "Linear dimension")
found, doc = utils.find_doc(App.activeDocument())
if not found:
@@ -310,17 +305,14 @@ def make_linear_dimension_obj(edge_object, i1=1, i2=2, dim_line=None):
edge_object_str = edge_object
if isinstance(edge_object, (list, tuple)):
_msg("edge_object: {}".format(edge_object))
_err(translate("draft","Wrong input: object must not be a list."))
_err(translate("draft","Wrong input: edge_object {} must not be a list or tuple.").format(edge_object))
return None
found, edge_object = utils.find_object(edge_object, doc)
if not found:
_msg("edge_object: {}".format(edge_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: edge_object {} not in document.").format(edge_object_str))
return None
_msg("edge_object: {}".format(edge_object.Label))
if not hasattr(edge_object, "Shape"):
_err(translate("draft","Wrong input: object doesn't have a 'Shape' to measure."))
return None
@@ -329,7 +321,6 @@ def make_linear_dimension_obj(edge_object, i1=1, i2=2, dim_line=None):
_err(translate("draft","Wrong input: object doesn't have at least one element in 'Vertexes' to use for measuring."))
return None
_msg("i1: {}".format(i1))
try:
utils.type_check([(i1, int)], name=_name)
except TypeError:
@@ -345,7 +336,6 @@ def make_linear_dimension_obj(edge_object, i1=1, i2=2, dim_line=None):
_err(translate("draft","Wrong input: vertex not in object."))
return None
_msg("i2: {}".format(i2))
try:
utils.type_check([(i2, int)], name=_name)
except TypeError:
@@ -361,7 +351,6 @@ def make_linear_dimension_obj(edge_object, i1=1, i2=2, dim_line=None):
_err(translate("draft","Wrong input: vertex not in object."))
return None
_msg("dim_line: {}".format(dim_line))
if dim_line:
try:
utils.type_check([(dim_line, App.Vector)], name=_name)
@@ -429,7 +418,6 @@ def make_radial_dimension_obj(edge_object, index=1, mode="radius",
If there is a problem it will return `None`.
"""
_name = "make_radial_dimension_obj"
utils.print_header(_name, "Radial dimension")
found, doc = utils.find_doc(App.activeDocument())
if not found:
@@ -441,11 +429,9 @@ def make_radial_dimension_obj(edge_object, index=1, mode="radius",
found, edge_object = utils.find_object(edge_object, doc)
if not found:
_msg("edge_object: {}".format(edge_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: edge_object {} not in document.").format(edge_object_str))
return None
_msg("edge_object: {}".format(edge_object.Label))
if not hasattr(edge_object, "Shape"):
_err(translate("draft","Wrong input: object doesn't have a 'Shape' to measure."))
return None
@@ -454,7 +440,6 @@ def make_radial_dimension_obj(edge_object, index=1, mode="radius",
_err(translate("draft","Wrong input: object doesn't have at least one element in 'Edges' to use for measuring."))
return None
_msg("index: {}".format(index))
try:
utils.type_check([(index, int)], name=_name)
except TypeError:
@@ -474,7 +459,6 @@ def make_radial_dimension_obj(edge_object, index=1, mode="radius",
_err(translate("draft","Wrong input: index doesn't correspond to a circular edge."))
return None
_msg("mode: {}".format(mode))
try:
utils.type_check([(mode, str)], name=_name)
except TypeError:
@@ -485,7 +469,6 @@ def make_radial_dimension_obj(edge_object, index=1, mode="radius",
_err(translate("draft","Wrong input: must be a string, 'radius' or 'diameter'."))
return None
_msg("dim_line: {}".format(dim_line))
if dim_line:
try:
utils.type_check([(dim_line, App.Vector)], name=_name)
@@ -548,7 +531,6 @@ def make_angular_dimension(center=App.Vector(0, 0, 0),
If there is a problem it will return `None`.
"""
_name = "make_angular_dimension"
utils.print_header(_name, "Angular dimension")
# Prevent later modification of a default parameter by using a placeholder
if angles is None:
@@ -559,14 +541,12 @@ def make_angular_dimension(center=App.Vector(0, 0, 0),
_err(translate("draft","No active document. Aborting."))
return None
_msg("center: {}".format(center))
try:
utils.type_check([(center, App.Vector)], name=_name)
except TypeError:
_err(translate("draft","Wrong input: must be a vector."))
return None
_msg("angles: {}".format(angles))
try:
utils.type_check([(angles, (tuple, list))], name=_name)
@@ -587,14 +567,12 @@ def make_angular_dimension(center=App.Vector(0, 0, 0),
if angles[n] > 360:
angles[n] = angles[n] - 360
_msg("dim_line: {}".format(dim_line))
try:
utils.type_check([(dim_line, App.Vector)], name=_name)
except TypeError:
_err(translate("draft","Wrong input: must be a vector."))
return None
_msg("normal: {}".format(normal))
if normal:
try:
utils.type_check([(dim_line, App.Vector)], name=_name)

24
src/Mod/Draft/draftmake/make_fillet.py
View File

@@ -34,7 +34,7 @@ import draftutils.utils as utils
import draftutils.gui_utils as gui_utils
import draftobjects.fillet as fillet
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
if App.GuiUp:
@@ -47,17 +47,6 @@ DraftGeomUtils = lz.LazyLoader("DraftGeomUtils", globals(), "DraftGeomUtils")
## \addtogroup draftmake
# @{
def _print_obj_length(obj, edge, num=1):
if hasattr(obj, "Label"):
name = obj.Label
else:
name = num
_msg("({0}): {1}; {2} {3}".format(num, name,
translate("draft","length:"), edge.Length))
def _extract_edges(objs):
"""Extract the edges from the list of objects, Draft lines or Part.Edges.
@@ -79,8 +68,6 @@ def _extract_edges(objs):
if o1.ShapeType in "Edge":
e1 = o1
_print_obj_length(o1, e1, num=1)
if hasattr(o2, "PropertiesList"):
if "Proxy" in o2.PropertiesList:
if hasattr(o2.Proxy, "Type"):
@@ -93,8 +80,6 @@ def _extract_edges(objs):
if o2.ShapeType in "Edge":
e2 = o2
_print_obj_length(o2, e2, num=2)
return e1, e2
@@ -126,7 +111,6 @@ def make_fillet(objs, radius=100, chamfer=False, delete=False):
It returns `None` if it fails producing the object.
"""
_name = "make_fillet"
utils.print_header(_name, "Fillet")
if len(objs) != 2:
_err(translate("draft","Two elements are needed."))
@@ -139,11 +123,6 @@ def make_fillet(objs, radius=100, chamfer=False, delete=False):
_err(translate("draft","Radius is too large") + ", r={}".format(radius))
return None
lengths = [edges[0].Length, edges[1].Length, edges[2].Length]
_msg(translate("draft","Segment") + " 1, " + translate("draft","length:") + " {}".format(lengths[0]))
_msg(translate("draft","Segment") + " 2, " + translate("draft","length:") + " {}".format(lengths[1]))
_msg(translate("draft","Segment") + " 3, " + translate("draft","length:") + " {}".format(lengths[2]))
try:
wire = Part.Wire(edges)
except Part.OCCError:
@@ -161,7 +140,6 @@ def make_fillet(objs, radius=100, chamfer=False, delete=False):
if delete:
_doc.removeObject(objs[0].Name)
_doc.removeObject(objs[1].Name)
_msg(translate("draft","Removed original objects."))
if App.GuiUp:
view_fillet.ViewProviderFillet(obj.ViewObject)

26
src/Mod/Draft/draftmake/make_label.py
View File

@@ -35,7 +35,7 @@ from draftobjects import label
from draftutils import gui_utils
from draftutils import params
from draftutils import utils
from draftutils.messages import _msg, _wrn, _err
from draftutils.messages import _wrn, _err
from draftutils.translate import translate
if App.GuiUp:
@@ -188,14 +188,12 @@ def make_label(target_point=App.Vector(0, 0, 0),
If there is a problem it will return `None`.
"""
_name = "make_label"
utils.print_header(_name, "Label")
found, doc = utils.find_doc(App.activeDocument())
if not found:
_err(translate("draft","No active document. Aborting."))
return None
_msg("target_point: {}".format(target_point))
if not target_point:
target_point = App.Vector(0, 0, 0)
try:
@@ -204,7 +202,6 @@ def make_label(target_point=App.Vector(0, 0, 0),
_err(translate("draft","Wrong input: must be a vector."))
return None
_msg("placement: {}".format(placement))
if not placement:
placement = App.Placement()
try:
@@ -226,20 +223,16 @@ def make_label(target_point=App.Vector(0, 0, 0),
if target_object:
if isinstance(target_object, (list, tuple)):
_msg("target_object: {}".format(target_object))
_err(translate("draft","Wrong input: object must not be a list."))
_err(translate("draft","Wrong input: target_object {} must not be a list.").format(target_object))
return None
found, target_object = utils.find_object(target_object, doc)
if not found:
_msg("target_object: {}".format(target_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: target_object {} not in document.").format(target_object_str))
return None
_msg("target_object: {}".format(target_object.Label))
if target_object and subelements:
_msg("subelements: {}".format(subelements))
try:
# Make a list
if isinstance(subelements, str):
@@ -248,7 +241,7 @@ def make_label(target_point=App.Vector(0, 0, 0),
utils.type_check([(subelements, (list, tuple, str))],
name=_name)
except TypeError:
_err(translate("draft","Wrong input: must be a list or tuple of strings, or a single string."))
_err(translate("draft","Wrong input: subelements must be a list or tuple of strings, or a single string."))
return None
# The subelements list is used to build a special list
@@ -259,11 +252,9 @@ def make_label(target_point=App.Vector(0, 0, 0),
for sub in subelements:
_sub = target_object.getSubObject(sub)
if not _sub:
_err("subelement: {}".format(sub))
_err(translate("draft","Wrong input: subelement not in object."))
_err(translate("draft","Wrong input: subelement {} not in object.").format(sub))
return None
_msg("label_type: {}".format(label_type))
if not label_type:
label_type = "Custom"
try:
@@ -277,7 +268,6 @@ def make_label(target_point=App.Vector(0, 0, 0),
_err(translate("draft", "Wrong input: label_type must be one of the following: ") + str(types).strip("[]"))
return None
_msg("custom_text: {}".format(custom_text))
if not custom_text:
custom_text = "Label"
try:
@@ -291,7 +281,6 @@ def make_label(target_point=App.Vector(0, 0, 0),
_err(translate("draft","Wrong input: must be a list of strings or a single string."))
return None
_msg("direction: {}".format(direction))
if not direction:
direction = "Horizontal"
try:
@@ -304,7 +293,6 @@ def make_label(target_point=App.Vector(0, 0, 0),
_err(translate("draft","Wrong input: must be a string, 'Horizontal', 'Vertical', or 'Custom'."))
return None
_msg("distance: {}".format(distance))
if not distance:
distance = 1
try:
@@ -314,9 +302,7 @@ def make_label(target_point=App.Vector(0, 0, 0),
return None
if points:
_msg("points: {}".format(points))
_err_msg = translate("draft","Wrong input: must be a list of at least two vectors.")
_err_msg = translate("draft","Wrong input: points {} must be a list of at least two vectors.").format(points)
try:
utils.type_check([(points, (tuple, list))], name=_name)
except TypeError:

2
src/Mod/Draft/draftmake/make_layer.py
View File

@@ -31,7 +31,7 @@
import FreeCAD as App
from draftobjects.layer import Layer, LayerContainer
from draftutils import utils
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
if App.GuiUp:

31
src/Mod/Draft/draftmake/make_orthoarray.py
View File

@@ -31,7 +31,7 @@ import FreeCAD as App
import draftutils.utils as utils
import draftmake.make_array as make_array
from draftutils.messages import _msg, _wrn, _err
from draftutils.messages import _wrn, _err
from draftutils.translate import translate
@@ -57,7 +57,6 @@ def _make_ortho_array(base_object,
This should be handled by the subfunctions that use this one.
"""
_name = "_make_ortho_array"
utils.print_header(_name, translate("draft","Internal orthogonal array"), debug=False)
new_obj = make_array.make_array(base_object,
arg1=v_x, arg2=v_y, arg3=v_z,
@@ -68,11 +67,6 @@ def _make_ortho_array(base_object,
def _are_vectors(v_x, v_y, v_z=None, name="Unknown"):
"""Check that the vectors are numbers."""
_msg("v_x: {}".format(v_x))
_msg("v_y: {}".format(v_y))
if v_z:
_msg("v_z: {}".format(v_z))
try:
if v_z:
utils.type_check([(v_x, (int, float, App.Vector)),
@@ -102,11 +96,6 @@ def _are_vectors(v_x, v_y, v_z=None, name="Unknown"):
def _are_integers(n_x, n_y, n_z=None, name="Unknown"):
"""Check that the numbers are integers, with minimum value of 1."""
_msg("n_x: {}".format(n_x))
_msg("n_y: {}".format(n_y))
if n_z:
_msg("n_z: {}".format(n_z))
try:
if n_z:
utils.type_check([(n_x, int),
@@ -134,11 +123,6 @@ def _are_integers(n_x, n_y, n_z=None, name="Unknown"):
def _are_numbers(d_x, d_y, d_z=None, name="Unknown"):
"""Check that the numbers are numbers."""
_msg("d_x: {}".format(d_x))
_msg("d_y: {}".format(d_y))
if d_z:
_msg("d_z: {}".format(d_z))
try:
if d_z:
utils.type_check([(d_x, (int, float)),
@@ -163,12 +147,9 @@ def _find_object_in_doc(base_object, doc=None):
found, base_object = utils.find_object(base_object,
doc=doc)
if not found:
_msg("base_object: {}".format(base_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: base_object {} not in document.").format(base_object_str))
return not FOUND, base_object
_msg("base_object: {}".format(base_object.Label))
return FOUND, base_object
@@ -272,7 +253,6 @@ def make_ortho_array(base_object,
make_circular_array, make_path_array, make_point_array
"""
_name = "make_ortho_array"
utils.print_header(_name, translate("draft","Orthogonal array"))
found, base_object = _find_object_in_doc(base_object,
doc=App.activeDocument())
@@ -288,7 +268,6 @@ def make_ortho_array(base_object,
return None
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
new_obj = _make_ortho_array(base_object,
v_x=v_x, v_y=v_y, v_z=v_z,
@@ -347,7 +326,6 @@ def make_ortho_array2d(base_object,
make_circular_array, make_path_array, make_point_array
"""
_name = "make_ortho_array2d"
utils.print_header(_name, translate("draft","Orthogonal array 2D"))
found, base_object = _find_object_in_doc(base_object,
doc=App.activeDocument())
@@ -363,7 +341,6 @@ def make_ortho_array2d(base_object,
return None
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
new_obj = _make_ortho_array(base_object,
v_x=v_x, v_y=v_y,
@@ -421,7 +398,6 @@ def make_rect_array(base_object,
make_circular_array, make_path_array, make_point_array
"""
_name = "make_rect_array"
utils.print_header(_name, translate("draft","Rectangular array"))
found, base_object = _find_object_in_doc(base_object,
doc=App.activeDocument())
@@ -437,7 +413,6 @@ def make_rect_array(base_object,
return None
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
new_obj = _make_ortho_array(base_object,
v_x=App.Vector(d_x, 0, 0),
@@ -498,7 +473,6 @@ def make_rect_array2d(base_object,
make_circular_array, make_path_array, make_point_array
"""
_name = "make_rect_array2d"
utils.print_header(_name, translate("draft","Rectangular array 2D"))
found, base_object = _find_object_in_doc(base_object,
doc=App.activeDocument())
@@ -514,7 +488,6 @@ def make_rect_array2d(base_object,
return None
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
new_obj = _make_ortho_array(base_object,
v_x=App.Vector(d_x, 0, 0),

40
src/Mod/Draft/draftmake/make_patharray.py
View File

@@ -40,7 +40,7 @@ import FreeCAD as App
import draftutils.utils as utils
import draftutils.gui_utils as gui_utils
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
from draftobjects.patharray import PathArray
from draftobjects.pathtwistedarray import PathTwistedArray
@@ -164,7 +164,6 @@ def make_path_array(base_object, path_object, count=4,
If there is a problem it will return `None`.
"""
_name = "make_path_array"
utils.print_header(_name, "Path array")
found, doc = utils.find_doc(App.activeDocument())
if not found:
@@ -176,24 +175,17 @@ def make_path_array(base_object, path_object, count=4,
found, base_object = utils.find_object(base_object, doc)
if not found:
_msg("base_object: {}".format(base_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: base_object {} not in document.").format(base_object_str))
return None
_msg("base_object: {}".format(base_object.Label))
if isinstance(path_object, str):
path_object_str = path_object
found, path_object = utils.find_object(path_object, doc)
if not found:
_msg("path_object: {}".format(path_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: path_object not in document.").format(path_object_str))
return None
_msg("path_object: {}".format(path_object.Label))
_msg("count: {}".format(count))
try:
utils.type_check([(count, (int, float))],
name=_name)
@@ -202,7 +194,6 @@ def make_path_array(base_object, path_object, count=4,
return None
count = int(count)
_msg("extra: {}".format(extra))
try:
utils.type_check([(extra, App.Vector)],
name=_name)
@@ -210,7 +201,6 @@ def make_path_array(base_object, path_object, count=4,
_err(translate("draft","Wrong input: must be a vector."))
return None
_msg("subelements: {}".format(subelements))
if subelements:
try:
# Make a list
@@ -243,9 +233,7 @@ def make_path_array(base_object, path_object, count=4,
sub_list = None
align = bool(align)
_msg("align: {}".format(align))
_msg("align_mode: {}".format(align_mode))
try:
utils.type_check([(align_mode, str)],
name=_name)
@@ -256,7 +244,6 @@ def make_path_array(base_object, path_object, count=4,
_err(translate("draft","Wrong input: must be 'Original', 'Frenet', or 'Tangent'."))
return None
_msg("tan_vector: {}".format(tan_vector))
try:
utils.type_check([(tan_vector, App.Vector)],
name=_name)
@@ -265,9 +252,6 @@ def make_path_array(base_object, path_object, count=4,
return None
force_vertical = bool(force_vertical)
_msg("force_vertical: {}".format(force_vertical))
_msg("vertical_vector: {}".format(vertical_vector))
try:
utils.type_check([(vertical_vector, App.Vector)],
name=_name)
@@ -275,7 +259,6 @@ def make_path_array(base_object, path_object, count=4,
_err(translate("draft","Wrong input: must be a vector."))
return None
_msg("start_offset: {}".format(start_offset))
try:
utils.type_check([(start_offset, (int, float))],
name=_name)
@@ -284,7 +267,6 @@ def make_path_array(base_object, path_object, count=4,
return None
start_offset = float(start_offset)
_msg("end_offset: {}".format(end_offset))
try:
utils.type_check([(end_offset, (int, float))],
name=_name)
@@ -294,7 +276,6 @@ def make_path_array(base_object, path_object, count=4,
end_offset = float(end_offset)
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
if use_link:
# The PathArray class must be called in this special way
@@ -351,7 +332,6 @@ def make_path_twisted_array(base_object, path_object,
use_link=True):
"""Create a Path twisted array."""
_name = "make_path_twisted_array"
utils.print_header(_name, "Path twisted array")
found, doc = utils.find_doc(App.activeDocument())
if not found:
@@ -363,24 +343,16 @@ def make_path_twisted_array(base_object, path_object,
found, base_object = utils.find_object(base_object, doc)
if not found:
_msg("base_object: {}".format(base_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: base_object not in document.").format(base_object_str))
return None
_msg("base_object: {}".format(base_object.Label))
if isinstance(path_object, str):
path_object_str = path_object
found, path_object = utils.find_object(path_object, doc)
if not found:
_msg("path_object: {}".format(path_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: path_object not in document.").format(path_object_str))
return None
_msg("path_object: {}".format(path_object.Label))
_msg("count: {}".format(count))
try:
utils.type_check([(count, (int, float))],
name=_name)
@@ -390,8 +362,6 @@ def make_path_twisted_array(base_object, path_object,
count = int(count)
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
if use_link:
# The PathTwistedArray class must be called in this special way
# to make it a PathTwistLinkArray

14
src/Mod/Draft/draftmake/make_pointarray.py
View File

@@ -38,7 +38,7 @@ import FreeCAD as App
import draftutils.utils as utils
import draftutils.gui_utils as gui_utils
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
from draftobjects.pointarray import PointArray
@@ -84,7 +84,6 @@ def make_point_array(base_object, point_object, extra=None, use_link=True):
If there is a problem it will return `None`.
"""
_name = "make_point_array"
utils.print_header(_name, "Point array")
found, doc = utils.find_doc(App.activeDocument())
if not found:
@@ -96,31 +95,26 @@ def make_point_array(base_object, point_object, extra=None, use_link=True):
found, base_object = utils.find_object(base_object, doc)
if not found:
_msg("base_object: {}".format(base_object_str))
_err(translate("draft", "Wrong input: object not in document."))
_err(translate("draft", "Wrong input: base_object {} not in document.").format(base_object_str))
return None
_msg("base_object: {}".format(base_object.Label))
if isinstance(point_object, str):
point_object_str = point_object
found, point_object = utils.find_object(point_object, doc)
if not found:
_msg("point_object: {}".format(point_object_str))
_err(translate("draft", "Wrong input: object not in document."))
_err(translate("draft", "Wrong input: point_object {} not in document.").format(point_object_str))
return None
_msg("point_object: {}".format(point_object.Label))
if not ((hasattr(point_object, "Shape") and hasattr(point_object.Shape, "Vertexes"))
or hasattr(point_object, "Mesh")
or hasattr(point_object, "Points")):
_err(translate("draft", "Wrong input: object has the wrong type."))
return None
_msg("extra: {}".format(extra))
if not extra:
extra = App.Placement()
try:
utils.type_check([(extra, (App.Placement,
App.Vector,

13
src/Mod/Draft/draftmake/make_polararray.py
View File

@@ -31,7 +31,7 @@ import FreeCAD as App
import draftutils.utils as utils
import draftmake.make_array as make_array
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
@@ -91,7 +91,6 @@ def make_polar_array(base_object,
make_ortho_array, make_circular_array, make_path_array, make_point_array
"""
_name = "make_polar_array"
utils.print_header(_name, translate("draft","Polar array"))
if isinstance(base_object, str):
base_object_str = base_object
@@ -99,27 +98,21 @@ def make_polar_array(base_object,
found, base_object = utils.find_object(base_object,
doc=App.activeDocument())
if not found:
_msg("base_object: {}".format(base_object_str))
_err(translate("draft","Wrong input: object not in document."))
_err(translate("draft","Wrong input: base_object {} not in document.").format(base_object_str))
return None
_msg("base_object: {}".format(base_object.Label))
_msg("number: {}".format(number))
try:
utils.type_check([(number, int)], name=_name)
except TypeError:
_err(translate("draft","Wrong input: must be an integer number."))
return None
_msg("angle: {}".format(angle))
try:
utils.type_check([(angle, (int, float))], name=_name)
except TypeError:
_err(translate("draft","Wrong input: must be a number."))
return None
_msg("center: {}".format(center))
try:
utils.type_check([(center, App.Vector)], name=_name)
except TypeError:
@@ -127,8 +120,6 @@ def make_polar_array(base_object,
return None
use_link = bool(use_link)
_msg("use_link: {}".format(use_link))
new_obj = make_array.make_array(base_object,
arg1=center, arg2=angle, arg3=number,
use_link=use_link)

6
src/Mod/Draft/draftmake/make_text.py
View File

@@ -33,7 +33,7 @@ import FreeCAD as App
import draftutils.utils as utils
import draftutils.gui_utils as gui_utils
from draftutils.messages import _msg, _err
from draftutils.messages import _err
from draftutils.translate import translate
from draftobjects.text import Text
@@ -86,14 +86,12 @@ def make_text(string, placement=None, screen=False, height=None, line_spacing=1)
If there is a problem it will return `None`.
"""
_name = "make_text"
utils.print_header(_name, "Text")
found, doc = utils.find_doc(App.activeDocument())
if not found:
_err(translate("draft","No active document. Aborting."))
return None
_msg("string: {}".format(string))
try:
utils.type_check([(string, (str, list))], name=_name)
except TypeError:
@@ -105,7 +103,6 @@ def make_text(string, placement=None, screen=False, height=None, line_spacing=1)
_err(translate("draft","Wrong input: must be a list of strings or a single string."))
return None
_msg("placement: {}".format(placement))
if not placement:
placement = App.Placement()
try:
@@ -175,7 +172,6 @@ def convert_draft_texts(textslist=None):
If it is `None` it will convert all objects in the current document.
"""
_name = "convert_draft_texts"
utils.print_header(_name, "Convert Draft texts")
found, doc = utils.find_doc(App.activeDocument())
if not found: