From 418bafe6ee45c9d74699c6fb5df77833246383d7 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Wed, 8 Apr 2020 01:32:21 -0500 Subject: [PATCH] Draft: move Downgrade GuiCommand to gui_downgrade module --- src/Mod/Draft/CMakeLists.txt | 1 + src/Mod/Draft/DraftTools.py | 31 +------ src/Mod/Draft/draftguitools/gui_downgrade.py | 97 ++++++++++++++++++++ 3 files changed, 99 insertions(+), 30 deletions(-) create mode 100644 src/Mod/Draft/draftguitools/gui_downgrade.py diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index 8ade812a03..9dd7d90aa7 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -110,6 +110,7 @@ SET(Modifier_tools draftguitools/gui_join.py draftguitools/gui_split.py draftguitools/gui_upgrade.py + draftguitools/gui_downgrade.py ) SET(Draft_GUI_tools diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index ddb24d039d..eb2b424506 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -182,37 +182,9 @@ from draftguitools.gui_stretch import Stretch from draftguitools.gui_join import Join from draftguitools.gui_split import Split from draftguitools.gui_upgrade import Upgrade +from draftguitools.gui_downgrade import Downgrade -class Downgrade(Modifier): - '''The Draft_Downgrade FreeCAD command definition.''' - - def GetResources(self): - return {'Pixmap' : 'Draft_Downgrade', - 'Accel' : "D, N", - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Downgrade", "Downgrade"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Downgrade", "Explodes the selected objects into simpler objects, or subtracts faces")} - - def Activated(self): - Modifier.Activated(self,"Downgrade") - if self.ui: - if not FreeCADGui.Selection.getSelection(): - self.ui.selectUi() - FreeCAD.Console.PrintMessage(translate("draft", "Select an object to upgrade")+"\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(): - FreeCADGui.addModule("Draft") - self.commit(translate("draft","Downgrade"), - ['Draft.downgrade(FreeCADGui.Selection.getSelection(),delete=True)', - 'FreeCAD.ActiveDocument.recompute()']) - self.finish() - class Trimex(Modifier): """The Draft_Trimex FreeCAD command definition. This tool trims or extends lines, wires and arcs, @@ -1428,7 +1400,6 @@ from draftguitools.gui_snaps import ShowSnapBar # drawing commands # modification commands -FreeCADGui.addCommand('Draft_Downgrade',Downgrade()) FreeCADGui.addCommand('Draft_Trimex',Trimex()) FreeCADGui.addCommand('Draft_Scale',Scale()) FreeCADGui.addCommand('Draft_Drawing',Drawing()) diff --git a/src/Mod/Draft/draftguitools/gui_downgrade.py b/src/Mod/Draft/draftguitools/gui_downgrade.py new file mode 100644 index 0000000000..a4ee6caf09 --- /dev/null +++ b/src/Mod/Draft/draftguitools/gui_downgrade.py @@ -0,0 +1,97 @@ +# *************************************************************************** +# * (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 downgrading objects with the Draft Workbench. + +Downgrades 2D objects to simpler objects until it reaches +simple Edge primitives. For example, a Draft Line to wire, and then +to a series of edges. +""" +## @package gui_downgrade +# \ingroup DRAFT +# \brief Provides tools for downgrading objects with the Draft Workbench. + +from PySide.QtCore import QT_TRANSLATE_NOOP + +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 Downgrade(gui_base_original.Modifier): + """Gui Command for the Downgrade tool.""" + + def GetResources(self): + """Set icon, menu and tooltip.""" + _tip = ("Downgrades the selected objects into simpler shapes.\n" + "The result of the operation depends on the types of objects, " + "which may be able to be downgraded several times in a row.\n" + "For example, it explodes the selected polylines " + "into simpler faces, wires, and then edges. " + "It can also subtract faces.") + + return {'Pixmap': 'Draft_Downgrade', + 'Accel': "D, N", + 'MenuText': QT_TRANSLATE_NOOP("Draft_Downgrade", "Downgrade"), + 'ToolTip': QT_TRANSLATE_NOOP("Draft_Downgrade", _tip)} + + def Activated(self): + """Execute when the command is called.""" + super().Activated(name=_tr("Downgrade")) + if self.ui: + if not Gui.Selection.getSelection(): + self.ui.selectUi() + _msg(translate("draft", "Select an object to upgrade")) + self.call = \ + self.view.addEventCallback("SoEvent", + gui_tool_utils.selectObject) + else: + self.proceed() + + def proceed(self): + """Proceed with execution of the command after selection.""" + if self.call: + self.view.removeEventCallback("SoEvent", self.call) + + if Gui.Selection.getSelection(): + Gui.addModule("Draft") + _cmd = 'Draft.downgrade' + _cmd += '(' + _cmd += 'FreeCADGui.Selection.getSelection(), ' + _cmd += 'delete=True' + _cmd += ')' + _cmd_list = ['d = ' + _cmd, + 'FreeCAD.ActiveDocument.recompute()'] + self.commit(translate("draft", "Downgrade"), + _cmd_list) + self.finish() + + +Gui.addCommand('Draft_Downgrade', Downgrade())