Skip to content

Commit

Permalink
Draft: move Draft_Clone GuiCommand to gui_clone module
Browse files Browse the repository at this point in the history
Rename the Gui Command to `Clone`, and provide an alias
for the older name `Draft_Clone`, just in case.
  • Loading branch information
vocx-fc authored and yorikvanhavre committed Apr 24, 2020
1 parent f1ca3c9 commit b259d94
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 49 deletions.
1 change: 1 addition & 0 deletions src/Mod/Draft/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ SET(Modifier_tools
draftguitools/gui_patharray.py
draftguitools/gui_pointarray.py
draftguitools/gui_polararray.py
draftguitools/gui_clone.py
)

SET(Draft_GUI_tools
Expand Down
50 changes: 1 addition & 49 deletions src/Mod/Draft/DraftTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,54 +194,7 @@
from draftguitools.gui_patharray import PathLinkArray
from draftguitools.gui_pointarray import PointArray
import draftguitools.gui_arrays


class Draft_Clone(Modifier):
"""The Draft Clone command definition"""

def __init__(self):
Modifier.__init__(self)
self.moveAfterCloning = False

def GetResources(self):
return {'Pixmap' : 'Draft_Clone',
'Accel' : "C,L",
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Clone", "Clone"),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Draft_Clone", "Clones the selected object(s)")}

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 clone")+"\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():
l = len(FreeCADGui.Selection.getSelection())
FreeCADGui.addModule("Draft")
FreeCAD.ActiveDocument.openTransaction("Clone")
nonRepeatList = []
for obj in FreeCADGui.Selection.getSelection():
if obj not in nonRepeatList:
FreeCADGui.doCommand("Draft.clone(FreeCAD.ActiveDocument.getObject(\""+obj.Name+"\"))")
nonRepeatList.append(obj)
FreeCAD.ActiveDocument.commitTransaction()
FreeCAD.ActiveDocument.recompute()
FreeCADGui.Selection.clearSelection()
for i in range(l):
FreeCADGui.Selection.addSelection(FreeCAD.ActiveDocument.Objects[-(1+i)])
self.finish()

def finish(self,close=False):
Modifier.finish(self,close=False)
if self.moveAfterCloning:
ToDo.delay(FreeCADGui.runCommand, "Draft_Move")
from draftguitools.gui_clone import Draft_Clone


class Mirror(Modifier):
Expand Down Expand Up @@ -395,7 +348,6 @@ def numericInput(self,numx,numy,numz):
# drawing commands

# modification commands
FreeCADGui.addCommand('Draft_Clone',Draft_Clone())
FreeCADGui.addCommand('Draft_Mirror',Mirror())

# context commands
Expand Down
125 changes: 125 additions & 0 deletions src/Mod/Draft/draftguitools/gui_clone.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
# ***************************************************************************
# * (c) 2009, 2010 Yorik van Havre <[email protected]> *
# * (c) 2009, 2010 Ken Cline <[email protected]> *
# * (c) 2020 Eliud Cabrera Castillo <[email protected]> *
# * *
# * 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 clones of objects with the Draft Workbench.
The clone is basically a simple copy of the `Shape` of another object,
whether that is a Draft object or any other 3D object.
The Clone's `Shape` can be scaled in size in any direction.
This implementation was developed before the `App::Link` object was created.
In many cases using `App::Link` makes more sense, as this object is
more memory efficient as it reuses the same internal `Shape`
instead of creating a copy of it.
"""
## @package gui_clone
# \ingroup DRAFT
# \brief Provides tools for creating clones of objects.

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
import draftutils.todo as todo
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 Clone(gui_base_original.Modifier):
"""Gui Command for the Clone tool."""

def __init__(self):
super().__init__()
self.moveAfterCloning = False

def GetResources(self):
"""Set icon, menu and tooltip."""
_tip = ("Creates a clone of the selected objects.\n"
"The resulting clone can be scaled in each "
"of its three directions.")

return {'Pixmap': 'Draft_Clone',
'Accel': "C,L",
'MenuText': QT_TRANSLATE_NOOP("Draft_Clone", "Clone"),
'ToolTip': QT_TRANSLATE_NOOP("Draft_Clone", _tip)}

def Activated(self):
"""Execute when the command is called."""
super().Activated(name=_tr("Clone"))
if not Gui.Selection.getSelection():
if self.ui:
self.ui.selectUi()
_msg(translate("draft", "Select an object to clone"))
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)

if Gui.Selection.getSelection():
sels = len(Gui.Selection.getSelection())
Gui.addModule("Draft")
App.ActiveDocument.openTransaction(translate("Draft", "Clone"))
nonRepeatList = []
n = 0
for obj in Gui.Selection.getSelection():
if obj not in nonRepeatList:
_cmd = "Draft.clone"
_cmd += "("
_cmd += "FreeCAD.ActiveDocument."
_cmd += 'getObject("' + obj.Name + '")'
_cmd += ")"
Gui.doCommand("c" + str(n) + " = " + _cmd)
nonRepeatList.append(obj)
n += 1
App.ActiveDocument.commitTransaction()
App.ActiveDocument.recompute()
Gui.Selection.clearSelection()

objects = App.ActiveDocument.Objects
for i in range(sels):
Gui.Selection.addSelection(objects[-(1 + i)])
self.finish()

def finish(self, close=False):
"""Terminate the operation of the tool."""
super().finish(close=False)
if self.moveAfterCloning:
todo.ToDo.delay(Gui.runCommand, "Draft_Move")


Draft_Clone = Clone
Gui.addCommand('Draft_Clone', Clone())

0 comments on commit b259d94

Please sign in to comment.