diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index 9f732e770c..9f968498c3 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -118,6 +118,7 @@ SET(Modifier_tools draftguitools/gui_shape2dview.py draftguitools/gui_draft2sketch.py draftguitools/gui_array_simple.py + draftguitools/gui_patharray.py ) SET(Draft_GUI_tools diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 969fd4c9ce..e56faf873a 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -190,48 +190,9 @@ from draftguitools.gui_shape2dview import Shape2DView from draftguitools.gui_draft2sketch import Draft2Sketch from draftguitools.gui_array_simple import Array from draftguitools.gui_array_simple import LinkArray +from draftguitools.gui_patharray import PathArray -class PathArray(Modifier): - """The PathArray FreeCAD command definition""" - - def __init__(self,use_link=False): - Modifier.__init__(self) - self.use_link = use_link - - def GetResources(self): - return {'Pixmap' : 'Draft_PathArray', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_PathArray", "PathArray"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_PathArray", "Creates copies of a selected object along a selected path.")} - - def Activated(self): - Modifier.Activated(self) - if not FreeCADGui.Selection.getSelectionEx(): - if self.ui: - self.ui.selectUi() - FreeCAD.Console.PrintMessage(translate("draft", "Please select base and path objects")+"\n") -# print("Please select base and path objects") - self.call = self.view.addEventCallback("SoEvent",selectObject) - else: - self.proceed() - - def proceed(self): - if self.call: - self.view.removeEventCallback("SoEvent",self.call) - sel = FreeCADGui.Selection.getSelectionEx() - if sel: - base = sel[0].Object - path = sel[1].Object - pathsubs = list(sel[1].SubElementNames) - defXlate = FreeCAD.Vector(0,0,0) - defCount = 4 - defAlign = False - FreeCAD.ActiveDocument.openTransaction("PathArray") - Draft.makePathArray(base,path,defCount,defXlate,defAlign,pathsubs,use_link=self.use_link) - FreeCAD.ActiveDocument.commitTransaction() - FreeCAD.ActiveDocument.recompute() # feature won't appear until recompute. - self.finish() - class PathLinkArray(PathArray): "The PathLinkArray FreeCAD command definition" @@ -475,7 +436,6 @@ from draftguitools.gui_snaps import ShowSnapBar # modification commands FreeCADGui.addCommand('Draft_Clone',Draft_Clone()) -FreeCADGui.addCommand('Draft_PathArray',PathArray()) FreeCADGui.addCommand('Draft_PathLinkArray',PathLinkArray()) FreeCADGui.addCommand('Draft_PointArray',PointArray()) FreeCADGui.addCommand('Draft_Mirror',Mirror()) diff --git a/src/Mod/Draft/draftguitools/gui_patharray.py b/src/Mod/Draft/draftguitools/gui_patharray.py new file mode 100644 index 0000000000..1d32d635c7 --- /dev/null +++ b/src/Mod/Draft/draftguitools/gui_patharray.py @@ -0,0 +1,111 @@ +# *************************************************************************** +# * (c) 2009, 2010 Yorik van Havre * +# * (c) 2009, 2010 Ken Cline * +# * (c) 2020 Eliud Cabrera Castillo * +# * * +# * This file is part of the FreeCAD CAx development system. * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * FreeCAD is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with FreeCAD; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** +"""Provides tools for creating path arrays with the Draft Workbench. + +The copies will be created along a path, like a polyline, B-spline, +or Bezier curve. +""" +## @package gui_patharray +# \ingroup DRAFT +# \brief Provides tools for creating path arrays with the Draft Workbench. + +from PySide.QtCore import QT_TRANSLATE_NOOP + +import FreeCAD as App +import FreeCADGui as Gui +import Draft +import Draft_rc +import draftguitools.gui_base_original as gui_base_original +import draftguitools.gui_tool_utils as gui_tool_utils +from draftutils.messages import _msg +from draftutils.translate import translate, _tr + +# The module is used to prevent complaints from code checkers (flake8) +True if Draft_rc.__name__ else False + + +class PathArray(gui_base_original.Modifier): + """Gui Command for the Path array tool. + + Parameters + ---------- + use_link: bool, optional + It defaults to `False`. If it is `True`, the created object + will be a `Link array`. + """ + + def __init__(self, use_link=False): + super().__init__() + self.use_link = use_link + + def GetResources(self): + """Set icon, menu and tooltip.""" + _menu = "Path array" + _tip = ("Creates copies of a selected object along a selected path.\n" + "First select the object, and then select the path.\n" + "The path can be a polyline, B-spline or Bezier curve.") + + return {'Pixmap': 'Draft_PathArray', + 'MenuText': QT_TRANSLATE_NOOP("Draft_PathArray", _menu), + 'ToolTip': QT_TRANSLATE_NOOP("Draft_PathArray", _tip)} + + def Activated(self, name=_tr("Path array")): + """Execute when the command is called.""" + super().Activated(name=name) + if not Gui.Selection.getSelectionEx(): + if self.ui: + self.ui.selectUi() + _msg(translate("draft", "Please select base and path objects")) + self.call = \ + self.view.addEventCallback("SoEvent", + gui_tool_utils.selectObject) + else: + self.proceed() + + def proceed(self): + """Proceed with the command if one object was selected.""" + if self.call: + self.view.removeEventCallback("SoEvent", self.call) + + sel = Gui.Selection.getSelectionEx() + if sel: + base = sel[0].Object + path = sel[1].Object + + defCount = 4 + defXlate = App.Vector(0, 0, 0) + defAlign = False + pathsubs = list(sel[1].SubElementNames) + + App.ActiveDocument.openTransaction("PathArray") + Draft.makePathArray(base, path, + defCount, defXlate, defAlign, pathsubs, + use_link=self.use_link) + App.ActiveDocument.commitTransaction() + App.ActiveDocument.recompute() + self.finish() + + +Gui.addCommand('Draft_PathArray', PathArray())