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

Draft: move Upgrade GuiCommand to gui_upgrade module

Browse Source
This commit is contained in:
vocx-fc
2020-04-08 00:54:02 -05:00
committed by Yorik van Havre
parent a9688f7d00
commit c3221222b3
3 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Draft/CMakeLists.txt
View File

@@ -109,6 +109,7 @@ SET(Modifier_tools
draftguitools/gui_stretch.py
draftguitools/gui_join.py
draftguitools/gui_split.py
draftguitools/gui_upgrade.py
)
SET(Draft_GUI_tools

32
src/Mod/Draft/DraftTools.py
View File

@@ -181,36 +181,7 @@ from draftguitools.gui_offset import Offset
from draftguitools.gui_stretch import Stretch
from draftguitools.gui_join import Join
from draftguitools.gui_split import Split
class Upgrade(Modifier):
'''The Draft_Upgrade FreeCAD command definition.'''
def GetResources(self):
return {'Pixmap' : 'Draft_Upgrade',
'Accel' : "U, P",
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Upgrade", "Upgrade"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Upgrade", "Joins the selected objects into one, or converts closed wires to filled faces, or unites faces")}
def Activated(self):
Modifier.Activated(self,"Upgrade")
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","Upgrade"),
['Draft.upgrade(FreeCADGui.Selection.getSelection(),delete=True)',
'FreeCAD.ActiveDocument.recompute()'])
self.finish()
from draftguitools.gui_upgrade import Upgrade
class Downgrade(Modifier):
@@ -1457,7 +1428,6 @@ from draftguitools.gui_snaps import ShowSnapBar
# drawing commands
# modification commands
FreeCADGui.addCommand('Draft_Upgrade',Upgrade())
FreeCADGui.addCommand('Draft_Downgrade',Downgrade())
FreeCADGui.addCommand('Draft_Trimex',Trimex())
FreeCADGui.addCommand('Draft_Scale',Scale())

98
src/Mod/Draft/draftguitools/gui_upgrade.py Normal file
View File

@@ -0,0 +1,98 @@
# ***************************************************************************
# * (c) 2009, 2010 Yorik van Havre <yorik@uncreated.net> *
# * (c) 2009, 2010 Ken Cline <cline@frii.com> *
# * (c) 2020 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de> *
# * *
# * 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 upgrading objects with the Draft Workbench.
Upgrades simple 2D objects to more complex objects until it reaches
Draft scripted objects. For example, an edge to a wire, and to a Draft Line.
"""
## @package gui_upgrade
# \ingroup DRAFT
# \brief Provides tools for upgrading 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 Upgrade(gui_base_original.Modifier):
"""Gui Command for the Upgrade tool."""
def GetResources(self):
"""Set icon, menu and tooltip."""
_tip = ("Upgrades the selected objects into more complex shapes.\n"
"The result of the operation depends on the types of objects, "
"which may be able to be upgraded several times in a row.\n"
"For example, it can join the selected objects into one, "
"convert simple edges into parametric polylines,\n"
"convert closed edges into filled faces "
"and parametric polygons, and merge faces "
"into a single face.")
return {'Pixmap': 'Draft_Upgrade',
'Accel': "U, P",
'MenuText': QT_TRANSLATE_NOOP("Draft_Upgrade", "Upgrade"),
'ToolTip': QT_TRANSLATE_NOOP("Draft_Upgrade", _tip)}
def Activated(self):
"""Execute when the command is called."""
super().Activated(name=_tr("Upgrade"))
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.upgrade'
_cmd += '('
_cmd += 'FreeCADGui.Selection.getSelection(), '
_cmd += 'delete=True'
_cmd += ')'
_cmd_list = ['u = ' + _cmd,
'FreeCAD.ActiveDocument.recompute()']
self.commit(translate("draft", "Upgrade"),
_cmd_list)
self.finish()
Gui.addCommand('Draft_Upgrade', Upgrade())