From e31b02f3e2ff39f1ed98bef0acb774bc4b3221e2 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Thu, 9 Apr 2020 18:42:16 -0500 Subject: [PATCH] Draft: move Shape2DView GuiCommand to gui_shape2dview module --- src/Mod/Draft/CMakeLists.txt | 1 + src/Mod/Draft/DraftTools.py | 46 +------ .../Draft/draftguitools/gui_shape2dview.py | 123 ++++++++++++++++++ 3 files changed, 125 insertions(+), 45 deletions(-) create mode 100644 src/Mod/Draft/draftguitools/gui_shape2dview.py diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index 862bd91fd1..aed45a9f3c 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -115,6 +115,7 @@ SET(Modifier_tools draftguitools/gui_scale.py draftguitools/gui_drawing.py draftguitools/gui_wire2spline.py + draftguitools/gui_shape2dview.py ) SET(Draft_GUI_tools diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 2af3c89447..292bd37008 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -186,50 +186,7 @@ from draftguitools.gui_trimex import Trimex from draftguitools.gui_scale import Scale from draftguitools.gui_drawing import Drawing from draftguitools.gui_wire2spline import WireToBSpline - - -class Shape2DView(Modifier): - """The Shape2DView FreeCAD command definition""" - - def GetResources(self): - return {'Pixmap' : 'Draft_2DShapeView', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Shape2DView", "Shape 2D view"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Shape2DView", "Creates Shape 2D views of selected objects")} - - def Activated(self): - Modifier.Activated(self) - if not FreeCADGui.Selection.getSelection(): - if self.ui: - self.ui.selectUi() - FreeCAD.Console.PrintMessage(translate("draft", "Select an object to project")+"\n") - self.call = self.view.addEventCallback("SoEvent",selectObject) - else: - self.proceed() - - def proceed(self): - if self.call: - self.view.removeEventCallback("SoEvent",self.call) - faces = [] - objs = [] - vec = FreeCADGui.ActiveDocument.ActiveView.getViewDirection().negative() - sel = FreeCADGui.Selection.getSelectionEx() - for s in sel: - objs.append(s.Object) - for e in s.SubElementNames: - if "Face" in e: - faces.append(int(e[4:])-1) - #print(objs,faces) - commitlist = [] - FreeCADGui.addModule("Draft") - if (len(objs) == 1) and faces: - commitlist.append("Draft.makeShape2DView(FreeCAD.ActiveDocument."+objs[0].Name+",FreeCAD.Vector"+str(tuple(vec))+",facenumbers="+str(faces)+")") - else: - for o in objs: - commitlist.append("Draft.makeShape2DView(FreeCAD.ActiveDocument."+o.Name+",FreeCAD.Vector"+str(tuple(vec))+")") - if commitlist: - commitlist.append("FreeCAD.ActiveDocument.recompute()") - self.commit(translate("draft","Create 2D view"),commitlist) - self.finish() +from draftguitools.gui_shape2dview import Shape2DView class Draft2Sketch(Modifier): @@ -635,7 +592,6 @@ FreeCADGui.addCommand('Draft_PointArray',PointArray()) FreeCADGui.addCommand('Draft_Mirror',Mirror()) # context commands -FreeCADGui.addCommand('Draft_Shape2DView',Shape2DView()) # a global place to look for active draft Command FreeCAD.activeDraftCommand = None diff --git a/src/Mod/Draft/draftguitools/gui_shape2dview.py b/src/Mod/Draft/draftguitools/gui_shape2dview.py new file mode 100644 index 0000000000..a68525b37c --- /dev/null +++ b/src/Mod/Draft/draftguitools/gui_shape2dview.py @@ -0,0 +1,123 @@ +# *************************************************************************** +# * (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 projecting objects into a 2D plane. + +This creates a 2D shape in the 3D view itself. This projection +can be further used to create a technical drawing using +the TechDraw Workbench. +""" +## @package gui_shape2dview +# \ingroup DRAFT +# \brief Provides tools for projecting objects into a 2D plane. + +from PySide.QtCore import QT_TRANSLATE_NOOP + +import FreeCADGui as Gui +import DraftVecUtils +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 Shape2DView(gui_base_original.Modifier): + """Gui Command for the Shape2DView tool.""" + + def GetResources(self): + """Set icon, menu and tooltip.""" + _menu = "Shape 2D view" + _tip = ("Creates a 2D projection of the selected objects " + "on the XY plane.\n" + "The initial projection direction is the negative " + "of the current active view direction.\n" + "You can select individual faces to project, or " + "the entire solid, and also include hidden lines.\n" + "These projections can be used to create technical " + "drawings with the TechDraw Workbench.") + + return {'Pixmap': 'Draft_2DShapeView', + 'MenuText': QT_TRANSLATE_NOOP("Draft_Shape2DView", _menu), + 'ToolTip': QT_TRANSLATE_NOOP("Draft_Shape2DView", _tip)} + + def Activated(self): + """Execute when the command is called.""" + super().Activated(name=_tr("Project 2D view")) + if not Gui.Selection.getSelection(): + if self.ui: + self.ui.selectUi() + _msg(translate("draft", "Select an object to project")) + 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) + + faces = [] + objs = [] + vec = Gui.ActiveDocument.ActiveView.getViewDirection().negative() + sel = Gui.Selection.getSelectionEx() + for s in sel: + objs.append(s.Object) + for e in s.SubElementNames: + if "Face" in e: + faces.append(int(e[4:]) - 1) + # print(objs, faces) + commitlist = [] + Gui.addModule("Draft") + if len(objs) == 1 and faces: + _cmd = "Draft.makeShape2DView" + _cmd += "(" + _cmd += "FreeCAD.ActiveDocument." + objs[0].Name + ", " + _cmd += DraftVecUtils.toString(vec) + ", " + _cmd += "facenumbers=" + str(faces) + _cmd += ")" + commitlist.append("sv = " + _cmd) + else: + n = 0 + for o in objs: + _cmd = "Draft.makeShape2DView" + _cmd += "(" + _cmd += "FreeCAD.ActiveDocument." + o.Name + ", " + _cmd += DraftVecUtils.toString(vec) + _cmd += ")" + commitlist.append("sv" + str(n) + " = " + _cmd) + n += 1 + if commitlist: + commitlist.append("FreeCAD.ActiveDocument.recompute()") + self.commit(translate("draft", "Create 2D view"), + commitlist) + self.finish() + + +Gui.addCommand('Draft_Shape2DView', Shape2DView())