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

Merge pull request #21416 from jffmichi/custom_gcode_allow_empty_lines

Browse Source 
CAM: allow empty lines in Custom operation
This commit is contained in:
sliptonic
2025-05-29 09:47:32 -05:00
committed by GitHub
parent cb290a2396 09e356cec6
commit 17e56f6570
17 changed files with 81 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Mod/CAM/CAMTests/TestRefactoredTestPost.py
View File

@@ -1115,6 +1115,42 @@ G54
#############################################################################
def test00191(self):
"""Make sure postprocessor doesn't crash on blank lines"""
path = [
Path.Command("G0 X1"),
Path.Command(""),
Path.Command("G0 X2"),
]
self.post.values["OUTPUT_BLANK_LINES"] = True
self.multi_compare(
path,
"""G90
G21
G54
G0 X1.000
G0 X2.000
""",
"",
)
self.post.values["OUTPUT_BLANK_LINES"] = False
self.multi_compare(
path,
"""G90
G21
G54
G0 X1.000
G0 X2.000
""",
"",
)
#############################################################################
def test00200(self):
"""Test Outputting visible arguments.

2
src/Mod/CAM/Path/Op/Gui/Custom.py
View File

@@ -61,7 +61,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
return signals
def setGCode(self):
self.obj.Gcode = self.form.txtGCode.toPlainText().splitlines()
self.obj.Gcode = self.form.txtGCode.toPlainText().split("\n")
Command = PathOpGui.SetupOperation(

4
src/Mod/CAM/Path/Post/UtilsArguments.py
View File

@@ -513,6 +513,10 @@ def init_shared_values(values: Values) -> None:
#
values["OUTPUT_COMMENTS"] = True
#
# If True output blank lines. If False blank lines are suppressed.
#
values["OUTPUT_BLANK_LINES"] = True
#
# if False duplicate axis values or feeds are suppressed
# if they are the same as the previous line.
#

8
src/Mod/CAM/Path/Post/UtilsParse.py
View File

@@ -707,12 +707,18 @@ def parse_a_path(values: Values, gcode: Gcode, pathobj) -> None:
command = c.Name
command_line = []
# Skip blank lines if requested
if not command:
if not values["OUTPUT_BLANK_LINES"]:
continue
# Modify the command name if necessary
if command[0] == "(":
if command.startswith("("):
if not values["OUTPUT_COMMENTS"]:
continue
if values["COMMENT_SYMBOL"] != "(" and len(command) > 2:
command = create_comment(values, command[1:-1])
cmd = check_for_an_adaptive_op(values, command, command_line, adaptive_op_variables)
if cmd:
command = cmd

2
src/Mod/CAM/Path/Post/scripts/KineticNCBeamicon2_post.py
View File

@@ -344,7 +344,7 @@ def parse(pathobj):
if command == lastcommand:
outstring.pop(0)
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

2
src/Mod/CAM/Path/Post/scripts/centroid_post.py
View File

@@ -282,7 +282,7 @@ def parse(pathobj):
commandlist = [] # list of elements in the command, code and params.
command = c.Name # command M or G code or comment string
if command[0] == "(":
if command.startswith("("):
command = PostUtils.fcoms(command, COMMENT)
commandlist.append(command)

2
src/Mod/CAM/Path/Post/scripts/dynapath_4060_post.py
View File

@@ -394,7 +394,7 @@ def parse(pathobj):
if command == lastcommand:
outstring.pop(0)
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

11
src/Mod/CAM/Path/Post/scripts/fablin_post.py
View File

@@ -199,9 +199,12 @@ def export(objectslist, filename, argstring):
print("done postprocessing.")
gfile = pyopen(filename, "w")
gfile.write(final)
gfile.close()
if not filename == "-":
gfile = pyopen(filename, "w")
gfile.write(final)
gfile.close()
return final
def linenumber():
@@ -251,7 +254,7 @@ def parse(pathobj):
command = c.Name
# fablin does not support parenthesis syntax, so removing that (pocket) in the agnostic gcode
if command[0] == "(":
if command.startswith("("):
if not OUTPUT_COMMENTS:
pass
else:

2
src/Mod/CAM/Path/Post/scripts/fangling_post.py
View File

@@ -408,7 +408,7 @@ def parse(pathobj):
if command == lastcommand:
outstring.pop(0)
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

2
src/Mod/CAM/Path/Post/scripts/fanuc_post.py
View File

@@ -496,7 +496,7 @@ def parse(pathobj):
if command == "G80" and lastcommand == nextcommand:
continue
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

2
src/Mod/CAM/Path/Post/scripts/jtech_post.py
View File

@@ -313,7 +313,7 @@ def parse(pathobj):
if command == lastcommand:
outstring.pop(0)
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

2
src/Mod/CAM/Path/Post/scripts/linuxcnc_post.py
View File

@@ -347,7 +347,7 @@ def parse(pathobj):
if command == lastcommand:
outstring.pop(0)
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

2
src/Mod/CAM/Path/Post/scripts/mach3_mach4_post.py
View File

@@ -379,7 +379,7 @@ def parse(pathobj):
if command == lastcommand:
outstring.pop(0)
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

2
src/Mod/CAM/Path/Post/scripts/opensbp_post.py
View File

@@ -359,7 +359,7 @@ def parse(pathobj):
output += scommands[command](c)
if c.Parameters:
CurrentState.update(c.Parameters)
elif command[0] == "(":
elif command.startswith("("):
output += "' " + command + "\n"
else:
print("I don't know what the hell the command: ", end="")

21
src/Mod/CAM/Path/Post/scripts/philips_post.py
View File

@@ -352,6 +352,7 @@ def linenumberify(GCodeString):
def export(objectslist, filename, argstring):
processArguments(argstring)
global UNITS
global linenr
@@ -412,7 +413,7 @@ def export(objectslist, filename, argstring):
command = command.replace("G0", "G") # normalize: G01 -> G1
if command != UNITS or UNITS_INCLUDED:
if command[0] == "(":
if command.startswith("("):
command = PostUtils.fcoms(command, COMMENT)
# the mapping is done for output only! For internal things we
# still use the old value.
@@ -584,8 +585,16 @@ def export(objectslist, filename, argstring):
lastcommand = c.Name
gcode = gcode.replace("_", "-")
gcode += linenumberify(GCODE_FOOTER)
if SHOW_EDITOR:
PostUtils.editor(gcode)
gfile = pyopen(filename, "w")
gfile.write(gcode)
gfile.close()
# show the gCode result dialog
if FreeCAD.GuiUp and SHOW_EDITOR:
final = PostUtils.editor(gcode)
else:
final = gcode
if not filename == "-":
gfile = pyopen(filename, "w")
gfile.write(final)
gfile.close()
return final

2
src/Mod/CAM/Path/Post/scripts/uccnc_post.py
View File

@@ -602,7 +602,7 @@ def parse(pathobj):
if command == lastcommand:
commandlist.pop(0)
if c.Name[0] == "(" and not OUTPUT_COMMENTS: # command is a comment
if c.Name.startswith("(") and not OUTPUT_COMMENTS: # command is a comment
continue
# Now add the remaining parameters in order

2
src/Mod/CAM/Path/Post/scripts/wedm_post.py
View File

@@ -448,7 +448,7 @@ def parse(pathobj):
if command == lastcommand:
outstring.pop(0)
if command[0] == "(": # command is a comment
if command.startswith("("): # command is a comment
if OUTPUT_COMMENTS: # Edit comment with COMMENT_CHAR
outstring.insert(0, COMMENT_CHAR)
else: