From d3646b05773508e258d1476a02cd5caa5e41c5f0 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Thu, 2 Apr 2020 17:39:20 -0600 Subject: [PATCH] Draft: move Facebinder GuiCommand to gui_facebinders module --- src/Mod/Draft/CMakeLists.txt | 1 + src/Mod/Draft/DraftTools.py | 36 +------ .../Draft/draftguitools/gui_facebinders.py | 93 +++++++++++++++++++ 3 files changed, 95 insertions(+), 35 deletions(-) create mode 100644 src/Mod/Draft/draftguitools/gui_facebinders.py diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index fc4acafec0..8d8bea0c15 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -96,6 +96,7 @@ SET(Creator_tools draftguitools/gui_dimensions.py draftguitools/gui_shapestrings.py draftguitools/gui_points.py + draftguitools/gui_facebinders.py ) SET(Draft_GUI_tools diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 8a55269af8..b2d5a64e28 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -164,6 +164,7 @@ from draftguitools.gui_texts import Text from draftguitools.gui_dimensions import Dimension from draftguitools.gui_shapestrings import ShapeString from draftguitools.gui_points import Point +from draftguitools.gui_facebinders import Draft_Facebinder # --------------------------------------------------------------------------- # Modifier functions @@ -2471,40 +2472,6 @@ class Draft_Clone(Modifier): ToDo.delay(FreeCADGui.runCommand, "Draft_Move") -class Draft_Facebinder(Creator): - """The Draft Facebinder command definition""" - - def GetResources(self): - return {'Pixmap' : 'Draft_Facebinder', - 'Accel' : "F,F", - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Facebinder", "Facebinder"), - 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Draft_Facebinder", "Creates a facebinder object from selected face(s)")} - - def Activated(self): - Creator.Activated(self) - if not FreeCADGui.Selection.getSelection(): - if self.ui: - self.ui.selectUi() - FreeCAD.Console.PrintMessage(translate("draft", "Select face(s) on existing object(s)")+"\n") - self.call = self.view.addEventCallback("SoEvent",selectObject) - else: - self.proceed() - - def proceed(self): - if self.call: - self.view.removeEventCallback("SoEvent",self.call) - if FreeCADGui.Selection.getSelection(): - FreeCAD.ActiveDocument.openTransaction("Facebinder") - FreeCADGui.addModule("Draft") - FreeCADGui.doCommand("s = FreeCADGui.Selection.getSelectionEx()") - FreeCADGui.doCommand("f = Draft.makeFacebinder(s)") - FreeCADGui.doCommand('Draft.autogroup(f)') - FreeCADGui.doCommand('FreeCAD.ActiveDocument.recompute()') - FreeCAD.ActiveDocument.commitTransaction() - FreeCAD.ActiveDocument.recompute() - self.finish() - - class Mirror(Modifier): """The Draft_Mirror FreeCAD command definition""" @@ -2789,7 +2756,6 @@ from draftguitools.gui_snaps import ShowSnapBar #--------------------------------------------------------------------------- # drawing commands -FreeCADGui.addCommand('Draft_Facebinder',Draft_Facebinder()) FreeCADGui.addCommand('Draft_Label',Draft_Label()) # modification commands diff --git a/src/Mod/Draft/draftguitools/gui_facebinders.py b/src/Mod/Draft/draftguitools/gui_facebinders.py new file mode 100644 index 0000000000..f9a74cb02a --- /dev/null +++ b/src/Mod/Draft/draftguitools/gui_facebinders.py @@ -0,0 +1,93 @@ +# *************************************************************************** +# * (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 facebinders with the Draft Workbench. + +A facebinder is a surface or shell created from the face of a solid object. +This tool allows extracting such faces to be used for other purposes +including extruding solids from faces. +""" +## @package gui_facebinders +# \ingroup DRAFT +# \brief Provides tools for creating facebinders with the Draft Workbench. + +from PySide.QtCore import QT_TRANSLATE_NOOP + +import FreeCAD as App +import FreeCADGui as Gui +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 Facebinder(gui_base_original.Creator): + """Gui Command for the Facebinder tool.""" + + def GetResources(self): + """Set icon, menu and tooltip.""" + _tip = "Creates a facebinder object from selected faces." + + d = {'Pixmap': 'Draft_Facebinder', + 'Accel': "F,F", + 'MenuText': QT_TRANSLATE_NOOP("Draft_Facebinder", "Facebinder"), + 'ToolTip': QT_TRANSLATE_NOOP("Draft_Facebinder", _tip)} + return d + + def Activated(self): + """Execute when the command is called.""" + super().Activated(name=_tr("Facebinder")) + + if not Gui.Selection.getSelection(): + if self.ui: + self.ui.selectUi() + _msg(translate("draft", "Select faces from existing objects")) + self.call = \ + self.view.addEventCallback("SoEvent", + gui_tool_utils.selectObject) + else: + self.proceed() + + def proceed(self): + """Proceed when a valid selection has been made.""" + if self.call: + self.view.removeEventCallback("SoEvent", self.call) + if Gui.Selection.getSelection(): + App.ActiveDocument.openTransaction("Create Facebinder") + Gui.addModule("Draft") + Gui.doCommand("s = FreeCADGui.Selection.getSelectionEx()") + Gui.doCommand("facebinder = Draft.makeFacebinder(s)") + Gui.doCommand('Draft.autogroup(facebinder)') + Gui.doCommand('FreeCAD.ActiveDocument.recompute()') + App.ActiveDocument.commitTransaction() + App.ActiveDocument.recompute() + self.finish() + + +Draft_Facebinder = Facebinder +Gui.addCommand('Draft_Facebinder', Facebinder())