suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving horiz and vert feed into the toolload object.

Browse Source
This commit is contained in:
brad 2016-03-24 15:42:14 -05:00 committed by Yorik van Havre
parent f1a4a5bcc4
commit 2f43b2a28d
4 changed files with 9 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Mod/Path/Gui/EngraveEdit.ui
View File

@ -34,7 +34,7 @@
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
<height>314</height>
</rect>
</property>
<attribute name="icon">
@ -99,7 +99,7 @@
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
<height>314</height>
</rect>
</property>
<attribute name="icon">
@ -146,7 +146,7 @@
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
<height>314</height>
</rect>
</property>
<attribute name="icon">
@ -187,60 +187,13 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../../../Gui/Icons/resource.qrc">
<normaloff>:/icons/FreeCAD-default/scalable/document-save-as.svg</normaloff>:/icons/FreeCAD-default/scalable/document-save-as.svg</iconset>
</attribute>
<attribute name="label">
<string>Speeds</string>
</attribute>
<layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0">
<widget class="Gui::InputField" name="horizFeed">
<property name="unit" stdset="0">
<string>mm/(s)</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Horiz Feed</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::InputField" name="vertFeed">
<property name="unit" stdset="0">
<string notr="true">mm/(s)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Vert Feed</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
<height>314</height>
</rect>
</property>
<attribute name="icon">

3
src/Mod/Path/PathScripts/PathLoadTool.py
View File

@ -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)

2
src/Mod/Path/PathScripts/PathProject.py
View File

@ -152,6 +152,8 @@ class CommandProject:
#create a machine obj
import PathScripts
PathScripts.PathMachine.CommandPathMachine.Create()
PLT = PathScripts.PathLoadTool.CommandPathLoadTool()
PLT.Activated()
return obj

81
src/Mod/Path/PathScripts/PathToolChange.py
View File

@ -1,81 +0,0 @@
# -*- coding: utf-8 -*-
#***************************************************************************
#* *
#* Copyright (c) 2015 Yorik van Havre <yorik@uncreated.net> *
#* *
#* 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())