Skip to content

Commit

Permalink
Added warning message about malfunctioning Conventional/Climb until t…
Browse files Browse the repository at this point in the history
…his gets fixed. See vlachoudis#881
  • Loading branch information
Harvie committed Jul 2, 2018
1 parent 82ed613 commit 6c70680
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CNC.py
Original file line number Diff line number Diff line change
Expand Up @@ -3504,6 +3504,11 @@ def cutDirection(self, items, direction=1):
# Climb = CCW for inside profiles and pockets, CW for outside profiles
# In such case it's OK to set operation to "conventional/climb", in other cases
# error should be displayed and user should use CW/CCW in other cases this gets very confusing!

msg = None
if abs(direction) > 1:
msg = "Beware that Conventional/Climb feature currently only works correctly for outside shapes!\n"
msg += "If not sure, please use CW/CCW until this gets fixed."
if direction==2: direction=1
if direction==-2: direction=-1

Expand All @@ -3524,6 +3529,8 @@ def cutDirection(self, items, direction=1):
undoinfo.append(self.setBlockLinesUndo(bid, block))
self.addUndo(undoinfo)

return msg

#----------------------------------------------------------------------
# Return information for a block
# return XXX
Expand Down
2 changes: 1 addition & 1 deletion bCNC.py
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,7 @@ def executeOnSelection(self, cmd, blocksonly, *args):
elif cmd == "CLOSE":
sel = self.gcode.close(items)
elif cmd == "DIRECTION":
self.gcode.cutDirection(items, *args)
sel = self.gcode.cutDirection(items, *args)
elif cmd == "DRILL":
sel = self.gcode.drill(items, *args)
elif cmd == "ORDER":
Expand Down

0 comments on commit 6c70680

Please sign in to comment.