From fd57f47e3dd8981471cef26264c548c2b500ebe5 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Mon, 27 Jun 2016 08:30:13 -0500 Subject: [PATCH] Fix feedrate bug #2597 minor edits to linuxcnc post processor --- src/Mod/Path/PathScripts/PathSurface.py | 30 +++- src/Mod/Path/PathScripts/linuxcnc_post.py | 206 ++++++++++++---------- 2 files changed, 131 insertions(+), 105 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathSurface.py b/src/Mod/Path/PathScripts/PathSurface.py index b7f98219fe53..e2fdc1538069 100644 --- a/src/Mod/Path/PathScripts/PathSurface.py +++ b/src/Mod/Path/PathScripts/PathSurface.py @@ -138,16 +138,16 @@ def drawLoops(loops): loopstring += "G0 Z" + str(obj.SafeHeight.Value) + "\n" loopstring += "G0 X" + \ str(fmt(p.x)) + " Y" + str(fmt(p.y)) + "\n" - loopstring += "G1 Z" + str(fmt(p.z)) + "\n" + loopstring += "G1 Z" + str(fmt(p.z)) + " F" + str(self.vertFeed) + "\n" for p in loop[1:]: loopstring += "G1 X" + \ str(fmt(p.x)) + " Y" + str(fmt(p.y)) + \ - " Z" + str(fmt(p.z)) + "\n" + " Z" + str(fmt(p.z)) + " F" + str(self.horizFeed)+ "\n" zheight = p.z p = loop[0] loopstring += "G1 X" + \ str(fmt(p.x)) + " Y" + str(fmt(p.y)) + \ - " Z" + str(fmt(zheight)) + "\n" + " Z" + str(fmt(zheight)) + " F" + str(self.vertFeed) + "\n" loopstring += "(loop end)" + "\n" print " loop ", nloop, " with ", len(loop), " points" nloop = nloop + 1 @@ -157,8 +157,6 @@ def drawLoops(loops): depthparams = depth_params(obj.ClearanceHeight.Value, obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown, obj.FinishDepth.Value, obj.FinalDepth.Value) - # stlfile = "../../stl/gnu_tux_mod.stl" - # surface = STLSurfaceSource(stlfile) surface = s t_before = time.time() @@ -167,12 +165,20 @@ def drawLoops(loops): # wl = ocl.AdaptiveWaterline() # this is slower, ca 60 seconds on i7 # CPU wl.setSTL(surface) - diam = 0.5 + diam = self.radius * 2 + + # FIXME: Need to get tool length from tool object length = 10.0 + + # FIXME: Need to get correct tool shape. Hard coding to ball cutter + # is bad. + # any ocl MillingCutter class should work here cutter = ocl.BallCutter(diam, length) + wl.setCutter(cutter) # this should be smaller than the smallest details in the STL file + wl.setSampling(obj.SampleInterval) # AdaptiveWaterline() also has settings for minimum sampling interval # (see c++ code) @@ -202,6 +208,8 @@ def _dropcutter(self, obj, s, bb): pdc = ocl.PathDropCutter() # create a pdc pdc.setSTL(s) pdc.setCutter(cutter) + + # FIXME: need to set minimumZ to something real pdc.minimumZ = 0.25 pdc.setSampling(obj.SampleInterval) @@ -249,7 +257,7 @@ def _dropcutter(self, obj, s, bb): for c in clp: output += "G1 X" + str(c.x) + " Y" + \ - str(c.y) + " Z" + str(c.z) + "\n" + str(c.y) + " Z" + str(c.z) + " F" + str(self.horizFeed) + "\n" return output @@ -369,7 +377,13 @@ def GetResources(self): 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Surface", "Creates a Path Surfacing object")} def IsActive(self): - return FreeCAD.ActiveDocument is not None + if FreeCAD.ActiveDocument is None: + active = False + elif PathUtils.findProj() is None: + active = False + else: + active = True + return active def Activated(self): diff --git a/src/Mod/Path/PathScripts/linuxcnc_post.py b/src/Mod/Path/PathScripts/linuxcnc_post.py index 5545edb1ba20..edc7189ad814 100644 --- a/src/Mod/Path/PathScripts/linuxcnc_post.py +++ b/src/Mod/Path/PathScripts/linuxcnc_post.py @@ -1,62 +1,62 @@ -#*************************************************************************** -#* (c) sliptonic (shopinthewoods@gmail.com) 2014 * -#* * -#* This file is part of the FreeCAD CAx development system. * -#* * -#* 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. * -#* * -#* FreeCAD 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 Lesser General Public License for more details. * -#* * -#* You should have received a copy of the GNU Library General Public * -#* License along with FreeCAD; if not, write to the Free Software * -#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * -#* USA * -#* * -#***************************************************************************/ +# *************************************************************************** +# * (c) sliptonic (shopinthewoods@gmail.com) 2014 * +# * * +# * This file is part of the FreeCAD CAx development system. * +# * * +# * 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. * +# * * +# * FreeCAD 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 Lesser General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with FreeCAD; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# ***************************************************************************/ ''' This is a postprocessor file for the Path workbench. It is used to take a pseudo-gcode fragment outputted by a Path object, and output real GCode suitable for a linuxcnc 3 axis mill. This postprocessor, once placed -in the appropriate PathScripts folder, can be used directly from inside FreeCAD, -via the GUI importer or via python scripts with: +in the appropriate PathScripts folder, can be used directly from inside +FreeCAD, via the GUI importer or via python scripts with: import linuxcnc_post linuxcnc_post.export(object,"/path/to/file.ncc") ''' import datetime -now = datetime.datetime.now() from PathScripts import PostUtils +now = datetime.datetime.now() -#These globals set common customization preferences +# These globals set common customization preferences OUTPUT_COMMENTS = True OUTPUT_HEADER = True OUTPUT_LINE_NUMBERS = False SHOW_EDITOR = True -MODAL = False #if true commands are suppressed if the same as previous line. +MODAL = False # if true commands are suppressed if the same as previous line. COMMAND_SPACE = " " -LINENR = 100 #line number starting value +LINENR = 100 # line number starting value -#These globals will be reflected in the Machine configuration of the project -UNITS = "G21" #G21 for metric, G20 for us standard -MACHINE_NAME = "Millstone" -CORNER_MIN = {'x':0, 'y':0, 'z':0 } -CORNER_MAX = {'x':500, 'y':300, 'z':300 } +# These globals will be reflected in the Machine configuration of the project +UNITS = "G21" # G21 for metric, G20 for us standard +MACHINE_NAME = "LinuxCNC" +CORNER_MIN = {'x': 0, 'y': 0, 'z': 0} +CORNER_MAX = {'x': 500, 'y': 300, 'z': 300} -#Preamble text will appear at the beginning of the GCODE output file. +# Preamble text will appear at the beginning of the GCODE output file. PREAMBLE = '''G17 G90 ''' -#Postamble text will appear following the last operation. +# Postamble text will appear following the last operation. POSTAMBLE = '''M05 G00 X-1.0 Y1.0 G17 G90 @@ -64,13 +64,13 @@ ''' -#Pre operation text will be inserted before every operation +# Pre operation text will be inserted before every operation PRE_OPERATION = '''''' - -#Post operation text will be inserted after every operation + +# Post operation text will be inserted after every operation POST_OPERATION = '''''' -#Tool Change commands will be inserted before a tool change +# Tool Change commands will be inserted before a tool change TOOL_CHANGE = '''''' @@ -79,62 +79,66 @@ pythonopen = open -def export(objectslist,filename): +def export(objectslist, filename): global UNITS for obj in objectslist: - if not hasattr(obj,"Path"): + if not hasattr(obj, "Path"): print "the object " + obj.Name + " is not a path. Please select only path and Compounds." return print "postprocessing..." gcode = "" - #Find the machine. - #The user my have overriden post processor defaults in the GUI. Make sure we're using the current values in the Machine Def. + # Find the machine. + # The user my have overriden post processor defaults in the GUI. Make + # sure we're using the current values in the Machine Def. myMachine = None for pathobj in objectslist: - if hasattr(pathobj,"Group"): #We have a compound or project. + if hasattr(pathobj, "Group"): # We have a compound or project. for p in pathobj.Group: if p.Name == "Machine": myMachine = p - if myMachine is None: + if myMachine is None: print "No machine found in this project" else: if myMachine.MachineUnits == "Metric": - UNITS = "G21" + UNITS = "G21" else: - UNITS = "G20" - + UNITS = "G20" # write header if OUTPUT_HEADER: gcode += linenumber() + "(Exported by FreeCAD)\n" - gcode += linenumber() + "(Post Processor: " + __name__ +")\n" - gcode += linenumber() + "(Output Time:"+str(now)+")\n" - - #Write the preamble - if OUTPUT_COMMENTS: gcode += linenumber() + "(begin preamble)\n" + gcode += linenumber() + "(Post Processor: " + __name__ + ")\n" + gcode += linenumber() + "(Output Time:" + str(now) + ")\n" + + # Write the preamble + if OUTPUT_COMMENTS: + gcode += linenumber() + "(begin preamble)\n" for line in PREAMBLE.splitlines(True): gcode += linenumber() + line - gcode += linenumber() + UNITS + "\n" + gcode += linenumber() + UNITS + "\n" for obj in objectslist: - - #do the pre_op - if OUTPUT_COMMENTS: gcode += linenumber() + "(begin operation: " + obj.Label + ")\n" + + # do the pre_op + if OUTPUT_COMMENTS: + gcode += linenumber() + "(begin operation: " + obj.Label + ")\n" for line in PRE_OPERATION.splitlines(True): gcode += linenumber() + line gcode += parse(obj) - #do the post_op - if OUTPUT_COMMENTS: gcode += linenumber() + "(finish operation: " + obj.Label + ")\n" + # do the post_op + if OUTPUT_COMMENTS: + gcode += linenumber() + "(finish operation: " + obj.Label + ")\n" for line in POST_OPERATION.splitlines(True): gcode += linenumber() + line - #do the post_amble + # do the post_amble - if OUTPUT_COMMENTS: gcode += "(begin postamble)\n" + if OUTPUT_COMMENTS: + gcode += "(begin postamble)\n" for line in POSTAMBLE.splitlines(True): gcode += linenumber() + line @@ -148,87 +152,95 @@ def export(objectslist,filename): final = gcode else: final = gcode - + print "done postprocessing." - - gfile = pythonopen(filename,"wb") - gfile.write(gcode) + + gfile = pythonopen(filename, "wb") + gfile.write(final) gfile.close() def linenumber(): global LINENR - if OUTPUT_LINE_NUMBERS == True: - LINENR += 10 + if OUTPUT_LINE_NUMBERS is True: + LINENR += 10 return "N" + str(LINENR) + " " return "" + def parse(pathobj): out = "" lastcommand = None - #params = ['X','Y','Z','A','B','I','J','K','F','S'] #This list control the order of parameters - params = ['X','Y','Z','A','B','I','J','F','S','T','Q','R','L'] #linuxcnc doesn't want K properties on XY plane Arcs need work. - - if hasattr(pathobj,"Group"): #We have a compound or project. - if OUTPUT_COMMENTS: out += linenumber() + "(compound: " + pathobj.Label + ")\n" + # params = ['X','Y','Z','A','B','I','J','K','F','S'] #This list control + # the order of parameters + # linuxcnc doesn't want K properties on XY plane Arcs need work. + params = ['X', 'Y', 'Z', 'A', 'B', 'I', 'J', 'F', 'S', 'T', 'Q', 'R', 'L'] + + if hasattr(pathobj, "Group"): # We have a compound or project. + if OUTPUT_COMMENTS: + out += linenumber() + "(compound: " + pathobj.Label + ")\n" for p in pathobj.Group: out += parse(p) - return out - else: #parsing simple path + return out + else: # parsing simple path - if not hasattr(pathobj,"Path"): #groups might contain non-path things like stock. + # groups might contain non-path things like stock. + if not hasattr(pathobj, "Path"): return out - if OUTPUT_COMMENTS: out += linenumber() + "(Path: " + pathobj.Label + ")\n" + if OUTPUT_COMMENTS: + out += linenumber() + "(Path: " + pathobj.Label + ")\n" for c in pathobj.Path.Commands: - outstring = [] + outstring = [] command = c.Name - outstring.append(command) - # if modal: only print the command if it is not the same as the last one - if MODAL == True: + outstring.append(command) + # if modal: only print the command if it is not the same as the + # last one + if MODAL is True: if command == lastcommand: - outstring.pop(0) - + outstring.pop(0) # Now add the remaining parameters in order for param in params: if param in c.Parameters: - if param == 'F': - outstring.append(param + format(c.Parameters['F'], '.2f')) + if param == 'F': + outstring.append( + param + format(c.Parameters['F'], '.2f')) elif param == 'T': outstring.append(param + str(c.Parameters['T'])) else: - outstring.append(param + format(c.Parameters[param], '.4f')) + outstring.append( + param + format(c.Parameters[param], '.4f')) # store the latest command lastcommand = command - # Check for Tool Change: + # Check for Tool Change: if command == 'M6': - if OUTPUT_COMMENTS: out += linenumber() + "(begin toolchange)\n" + if OUTPUT_COMMENTS: + out += linenumber() + "(begin toolchange)\n" for line in TOOL_CHANGE.splitlines(True): out += linenumber() + line if command == "message": - if OUTPUT_COMMENTS == False: + if OUTPUT_COMMENTS is False: out = [] else: - outstring.pop(0) #remove the command + outstring.pop(0) # remove the command - #prepend a line number and append a newline + # prepend a line number and append a newline if len(outstring) >= 1: - if OUTPUT_LINE_NUMBERS: - outstring.insert(0,(linenumber())) + if OUTPUT_LINE_NUMBERS: + outstring.insert(0, (linenumber())) - #append the line to the final output + # append the line to the final output for w in outstring: out += w + COMMAND_SPACE out = out.strip() + "\n" - + return out - - -print __name__ + " gcode postprocessor loaded." + +print __name__ + " gcode postprocessor loaded."