kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Changed property names

Browse Source
This commit is contained in:
Patrick Felixberger
2020-03-12 00:00:44 +01:00
parent 16c33fdb97
commit d4ba61bf77
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui
View File

@@ -131,7 +131,7 @@
<item row="7" column="4">
<widget class="QLabel" name="Offsetlabel">
<property name="text">
<string>Extra Offset</string>
<string>Extend Depth</string>
</property>
</widget>
</item>
@@ -144,12 +144,12 @@
</item>
<item>
<property name="text">
<string>Tip Length</string>
<string>Drill Tip</string>
</property>
</item>
<item>
<property name="text">
<string>2x Tip Length</string>
<string>2x Drill Tip</string>
</property>
</item>
</widget>

6
src/Mod/Path/PathScripts/PathDrilling.py
View File

@@ -76,7 +76,7 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp):
obj.ReturnLevel = ['G99', 'G98'] # Canned Cycle Return Level
obj.addProperty("App::PropertyDistance", "RetractHeight", "Drill", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height where feed starts and height during retract tool when path is finished while in a peck operation"))
obj.addProperty("App::PropertyEnumeration", "ExtraOffset", "Drill", QtCore.QT_TRANSLATE_NOOP("App::Property", "How far the drill depth is extended"))
obj.ExtraOffset = ['None', 'Tip Length', '2x Tip Length'] # Canned Cycle Return Level
obj.ExtraOffset = ['None', 'Drill Tip', '2x Drill Tip'] # Canned Cycle Return Level
# Rotation related properties
if not hasattr(obj, 'EnableRotation'):
@@ -105,9 +105,9 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp):
self.commandlist.append(Path.Command('G0', {'Z': obj.ClearanceHeight.Value, 'F': self.vertRapid}))
tiplength = 0.0
if obj.ExtraOffset == 'Tip Length':
if obj.ExtraOffset == 'Drill Tip':
tiplength = PathUtils.drillTipLength(self.tool)
elif obj.ExtraOffset == '2x Tip Length':
elif obj.ExtraOffset == '2x Drill Tip':
tiplength = PathUtils.drillTipLength(self.tool) * 2
holes = PathUtils.sort_jobs(holes, ['x', 'y'])