Skip to content

Commit

Permalink
Moving horiz and vert feed into the toolload object.
Browse files Browse the repository at this point in the history
  • Loading branch information
sliptonic authored and yorikvanhavre committed May 23, 2016
1 parent f1a4a5b commit 2f43b2a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 132 deletions.
55 changes: 4 additions & 51 deletions src/Mod/Path/Gui/EngraveEdit.ui
Expand Up @@ -34,7 +34,7 @@
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
<height>314</height>
</rect>
</property>
<attribute name="icon">
Expand Down Expand Up @@ -99,7 +99,7 @@
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
<height>314</height>
</rect>
</property>
<attribute name="icon">
Expand Down Expand Up @@ -146,7 +146,7 @@
<x>0</x>
<y>0</y>
<width>304</width>
<height>279</height>
<height>314</height>
</rect>
</property>
<attribute name="icon">
Expand Down Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions src/Mod/Path/PathScripts/PathLoadTool.py
Expand Up @@ -44,6 +44,9 @@ def __init__(self,obj):
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)
Expand Down
2 changes: 2 additions & 0 deletions src/Mod/Path/PathScripts/PathProject.py
Expand Up @@ -152,6 +152,8 @@ def Create(pathChildren = []):
#create a machine obj
import PathScripts
PathScripts.PathMachine.CommandPathMachine.Create()
PLT = PathScripts.PathLoadTool.CommandPathLoadTool()
PLT.Activated()

return obj

Expand Down
81 changes: 0 additions & 81 deletions src/Mod/Path/PathScripts/PathToolChange.py

This file was deleted.

0 comments on commit 2f43b2a

Please sign in to comment.