From 2f43b2a28dd94a5bdbc81a4b6aa0c4a02dcb5381 Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 24 Mar 2016 15:42:14 -0500 Subject: [PATCH] Moving horiz and vert feed into the toolload object. --- src/Mod/Path/Gui/EngraveEdit.ui | 55 ++------------- src/Mod/Path/PathScripts/PathLoadTool.py | 3 + src/Mod/Path/PathScripts/PathProject.py | 2 + src/Mod/Path/PathScripts/PathToolChange.py | 81 ---------------------- 4 files changed, 9 insertions(+), 132 deletions(-) delete mode 100644 src/Mod/Path/PathScripts/PathToolChange.py diff --git a/src/Mod/Path/Gui/EngraveEdit.ui b/src/Mod/Path/Gui/EngraveEdit.ui index 30cfe0cda..7e18f163d 100644 --- a/src/Mod/Path/Gui/EngraveEdit.ui +++ b/src/Mod/Path/Gui/EngraveEdit.ui @@ -34,7 +34,7 @@ 0 0 304 - 279 + 314 @@ -99,7 +99,7 @@ 0 0 304 - 279 + 314 @@ -146,7 +146,7 @@ 0 0 304 - 279 + 314 @@ -187,60 +187,13 @@ - - - - 0 - 0 - 304 - 279 - - - - - :/icons/FreeCAD-default/scalable/document-save-as.svg:/icons/FreeCAD-default/scalable/document-save-as.svg - - - Speeds - - - - - - mm/(s) - - - - - - - Horiz Feed - - - - - - - mm/(s) - - - - - - - Vert Feed - - - - - 0 0 304 - 279 + 314 diff --git a/src/Mod/Path/PathScripts/PathLoadTool.py b/src/Mod/Path/PathScripts/PathLoadTool.py index 625676575..2d1a0668a 100644 --- a/src/Mod/Path/PathScripts/PathLoadTool.py +++ b/src/Mod/Path/PathScripts/PathLoadTool.py @@ -44,6 +44,9 @@ class LoadTool: obj.addProperty("App::PropertyFloat", "SpindleSpeed", "Tool","The speed of the cutting spindle in RPM") obj.addProperty("App::PropertyEnumeration", "SpindleDir", "Tool","Direction of spindle rotation") obj.SpindleDir = ['Forward','Reverse'] + obj.addProperty("App::PropertySpeed", "VertFeed", "Feed",translate("Path","Feed rate for vertical moves in Z")) + obj.addProperty("App::PropertySpeed", "HorizFeed", "Feed",translate("Path","Feed rate for horizontal moves")) + obj.Proxy = self mode = 2 obj.setEditorMode('Placement',mode) diff --git a/src/Mod/Path/PathScripts/PathProject.py b/src/Mod/Path/PathScripts/PathProject.py index d445d8d44..0e3a043b9 100644 --- a/src/Mod/Path/PathScripts/PathProject.py +++ b/src/Mod/Path/PathScripts/PathProject.py @@ -152,6 +152,8 @@ class CommandProject: #create a machine obj import PathScripts PathScripts.PathMachine.CommandPathMachine.Create() + PLT = PathScripts.PathLoadTool.CommandPathLoadTool() + PLT.Activated() return obj diff --git a/src/Mod/Path/PathScripts/PathToolChange.py b/src/Mod/Path/PathScripts/PathToolChange.py deleted file mode 100644 index a7c14f33a..000000000 --- a/src/Mod/Path/PathScripts/PathToolChange.py +++ /dev/null @@ -1,81 +0,0 @@ -# -*- coding: utf-8 -*- - -#*************************************************************************** -#* * -#* Copyright (c) 2015 Yorik van Havre * -#* * -#* 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. * -#* * -#* This program 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 this program; if not, write to the Free Software * -#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * -#* USA * -#* * -#*************************************************************************** - -import FreeCAD,FreeCADGui,Path,PathGui -from PySide import QtCore,QtGui - -"""Path ToolChange object and FreeCAD command""" - -# Qt tanslation handling -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def translate(context, text, disambig=None): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def translate(context, text, disambig=None): - return QtGui.QApplication.translate(context, text, disambig) - - -class ObjectToolChange: - - - def __init__(self,obj): - obj.addProperty("App::PropertyInteger","ToolNumber","Path","The tool number to be used") - obj.Proxy = self - - def __getstate__(self): - return None - - def __setstate__(self,state): - return None - - def execute(self,obj): - path = Path.Path("M6T"+str(obj.ToolNumber)) - obj.Path = path - - -class CommandPathToolChange: - - - def GetResources(self): - return {'Pixmap' : 'Path-ToolChange', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_ToolChange","Tool Change"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_ToolChange","Changes the current tool")} - - def IsActive(self): - return not FreeCAD.ActiveDocument is None - - def Activated(self): - FreeCAD.ActiveDocument.openTransaction("Create Tool Change") - FreeCADGui.addModule("PathScripts.PathToolChange") - FreeCADGui.doCommand('obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython","ToolChange")') - FreeCADGui.doCommand('PathScripts.PathToolChange.ObjectToolChange(obj)') - FreeCADGui.doCommand('obj.ViewObject.Proxy = 0') - FreeCAD.ActiveDocument.commitTransaction() - FreeCAD.ActiveDocument.recompute() - - -if FreeCAD.GuiUp: - # register the FreeCAD command - FreeCADGui.addCommand('Path_ToolChange',CommandPathToolChange())