From b434347dbd67d1ab05e5a3dc4045e36df827d3a2 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Fri, 10 Apr 2020 01:10:25 -0500 Subject: [PATCH] Draft: move PointArray GuiCommand to gui_pointarray module --- src/Mod/Draft/CMakeLists.txt | 1 + src/Mod/Draft/DraftTools.py | 34 +----- src/Mod/Draft/draftguitools/gui_pointarray.py | 103 ++++++++++++++++++ 3 files changed, 105 insertions(+), 33 deletions(-) create mode 100644 src/Mod/Draft/draftguitools/gui_pointarray.py diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index 9f968498c3..56d93639dc 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -119,6 +119,7 @@ SET(Modifier_tools draftguitools/gui_draft2sketch.py draftguitools/gui_array_simple.py draftguitools/gui_patharray.py + draftguitools/gui_pointarray.py ) SET(Draft_GUI_tools diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 31fd41b3c1..8a16be07f9 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -192,38 +192,7 @@ from draftguitools.gui_array_simple import Array from draftguitools.gui_array_simple import LinkArray from draftguitools.gui_patharray import PathArray from draftguitools.gui_patharray import PathLinkArray - - -class PointArray(Modifier): - """The PointArray FreeCAD command definition""" - - def GetResources(self): - return {'Pixmap' : 'Draft_PointArray', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_PointArray", "PointArray"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_PointArray", "Creates copies of a selected object on the position of points.")} - - 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 pointlist objects\n")) - 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 - ptlst = sel[1].Object - FreeCAD.ActiveDocument.openTransaction("PointArray") - Draft.makePointArray(base, ptlst) - FreeCAD.ActiveDocument.commitTransaction() - FreeCAD.ActiveDocument.recompute() - self.finish() +from draftguitools.gui_pointarray import PointArray class Draft_Clone(Modifier): @@ -426,7 +395,6 @@ from draftguitools.gui_snaps import ShowSnapBar # modification commands FreeCADGui.addCommand('Draft_Clone',Draft_Clone()) -FreeCADGui.addCommand('Draft_PointArray',PointArray()) FreeCADGui.addCommand('Draft_Mirror',Mirror()) # context commands diff --git a/src/Mod/Draft/draftguitools/gui_pointarray.py b/src/Mod/Draft/draftguitools/gui_pointarray.py new file mode 100644 index 0000000000..7fa7faf1a3 --- /dev/null +++ b/src/Mod/Draft/draftguitools/gui_pointarray.py @@ -0,0 +1,103 @@ +# *************************************************************************** +# * (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 point arrays with the Draft Workbench. + +The copies will be created where various points are located. + +The points need to be grouped under a compound of points +before using this tool. +To create this compound, select various points and then use the Upgrade tool +to create a `Block`. +""" +## @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 PointArray(gui_base_original.Modifier): + """Gui Command for the Point array tool.""" + + def GetResources(self): + """Set icon, menu and tooltip.""" + _menu = "Point array" + _tip = ("Creates copies of a selected object at the position " + "of various points.\n" + "The points need to be grouped under a compound of points " + "before using this tool.\n" + "To create this compound, select various points " + "and then use the Upgrade tool to create a 'Block'.\n" + "Select the base object, and then select the compound " + "to create the point array.") + + return {'Pixmap': 'Draft_PointArray', + 'MenuText': QT_TRANSLATE_NOOP("Draft_PointArray", _menu), + 'ToolTip': QT_TRANSLATE_NOOP("Draft_PointArray", _tip)} + + def Activated(self): + """Execute when the command is called.""" + super().Activated(name=_tr("Point array")) + if not Gui.Selection.getSelectionEx(): + if self.ui: + self.ui.selectUi() + _msg(translate("draft", + "Please select base and pointlist 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 + ptlst = sel[1].Object + + App.ActiveDocument.openTransaction("PointArray") + Draft.makePointArray(base, ptlst) + App.ActiveDocument.commitTransaction() + App.ActiveDocument.recompute() + self.finish() + + +Gui.addCommand('Draft_PointArray', PointArray())