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

CAM: respect SHOW_OPERATION_LABELS in post-operation information

Browse Source
This commit is contained in:
jffmichi
2025-05-07 04:55:03 +02:00
parent 1e87d8e668
commit f4d853e5dc
5 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/CAM/CAMTests/TestRefactoredCentroidPost.py
View File

@@ -141,14 +141,14 @@ G53 G00 G17
G21
;Begin operation
G54
;End operation: Fixture
;End operation
;Begin operation
;TC: Default Tool
;Begin toolchange
M6 T1
;End operation: TC: Default Tool
;End operation
;Begin operation
;End operation: Profile
;End operation
;Begin postamble
M5
M25

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

@@ -306,15 +306,15 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
(comment with spaces)
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--command_space=' ' --comments",
@@ -326,15 +326,15 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
(comment with spaces)
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--command_space='' --comments",
@@ -352,15 +352,15 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
(comment with spaces)
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments",
@@ -372,15 +372,15 @@ G90
G21
;Begin operation
G54
;Finish operation: Fixture
;Finish operation
;Begin operation
;TC: Default Tool
;Begin toolchange
;M6 T1
;Finish operation: TC: Default Tool
;Finish operation
;Begin operation
;comment with spaces
;Finish operation: Profile
;Finish operation
;Begin postamble
""",
"--comment_symbol=';' --comments",
@@ -392,15 +392,15 @@ G90
G21
!Begin operation
G54
!Finish operation: Fixture
!Finish operation
!Begin operation
!TC: Default Tool
!Begin toolchange
!M6 T1
!Finish operation: TC: Default Tool
!Finish operation
!Begin operation
!comment with spaces
!Finish operation: Profile
!Finish operation
!Begin postamble
""",
"--comment_symbol='!' --comments",
@@ -471,14 +471,14 @@ G54
self.assertEqual(split_gcode[6], "G21")
self.assertEqual(split_gcode[7], "(Begin operation)")
self.assertEqual(split_gcode[8], "G54")
self.assertEqual(split_gcode[9], "(Finish operation: Fixture)")
self.assertEqual(split_gcode[9], "(Finish operation)")
self.assertEqual(split_gcode[10], "(Begin operation)")
self.assertEqual(split_gcode[11], "(TC: Default Tool)")
self.assertEqual(split_gcode[12], "(Begin toolchange)")
self.assertEqual(split_gcode[13], "(M6 T1)")
self.assertEqual(split_gcode[14], "(Finish operation: TC: Default Tool)")
self.assertEqual(split_gcode[14], "(Finish operation)")
self.assertEqual(split_gcode[15], "(Begin operation)")
self.assertEqual(split_gcode[16], "(Finish operation: Profile)")
self.assertEqual(split_gcode[16], "(Finish operation)")
self.assertEqual(split_gcode[17], "(Begin postamble)")
# Test with comments without header.
@@ -487,14 +487,14 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
"""
self.job.PostProcessorArgs = "--comments --no-header"

48
src/Mod/CAM/CAMTests/TestRefactoredTestPostGCodes.py
View File

@@ -768,12 +768,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -795,7 +795,7 @@ G1 Z0.000 F7380.000
G0 Z5.000
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",
@@ -865,12 +865,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -894,7 +894,7 @@ G0 Z13.000
G91
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",
@@ -951,12 +951,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -969,7 +969,7 @@ G1 Z0.000 F7380.000
G0 Z5.000
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",
@@ -1030,12 +1030,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -1050,7 +1050,7 @@ G0 Z13.000
G91
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",
@@ -1108,12 +1108,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -1127,7 +1127,7 @@ G4 P1.23456
G0 Z5.000
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",
@@ -1189,12 +1189,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -1210,7 +1210,7 @@ G0 Z13.000
G91
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",
@@ -1276,12 +1276,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -1303,7 +1303,7 @@ G1 Z0.000 F7380.000
G0 Z5.000
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",
@@ -1373,12 +1373,12 @@ G90
G21
(Begin operation)
G54
(Finish operation: Fixture)
(Finish operation)
(Begin operation)
(TC: Default Tool)
(Begin toolchange)
(M6 T1)
(Finish operation: TC: Default Tool)
(Finish operation)
(Begin operation)
G0 X1.000 Y2.000
G0 Z8.000
@@ -1402,7 +1402,7 @@ G0 Z13.000
G91
(G80)
G90
(Finish operation: Profile)
(Finish operation)
(Begin postamble)
""",
"--comments --translate_drill",

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

@@ -587,7 +587,8 @@ def init_shared_values(values: Values) -> None:
#
values["SHOW_MACHINE_UNITS"] = True
#
# If True then the current operation label is output just before the PRE_OPERATION.
# If True then the current operation label is output just before the PRE_OPERATION
# and just before the POST_OPERATION.
#
values["SHOW_OPERATION_LABELS"] = True
#

9
src/Mod/CAM/Path/Post/UtilsExport.py
View File

@@ -154,9 +154,12 @@ def output_postop(values: Values, gcode: Gcode, obj) -> None:
nl: str = "\n"
if values["OUTPUT_COMMENTS"]:
comment = PostUtilsParse.create_comment(
values, f'{values["FINISH_LABEL"]} operation: {obj.Label}'
)
if values["SHOW_OPERATION_LABELS"]:
comment = PostUtilsParse.create_comment(
values, f'{values["FINISH_LABEL"]} operation: {obj.Label}'
)
else:
comment = PostUtilsParse.create_comment(values, f'{values["FINISH_LABEL"]} operation')
gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}")
for line in values["POST_OPERATION"].splitlines(False):
gcode.append(f"{PostUtilsParse.linenumber(values)}{line}{nl}")