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

Change G-code editor buttons

Browse Source
This commit is contained in:
Thom de Jong
2025-11-12 21:11:06 +01:00
parent 8373716537
commit 82b86decdf
2 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/CAM/Path/Post/Utils.py
View File

@@ -227,7 +227,9 @@ class GCodeEditorDialog(QtGui.QDialog):
# OK and Cancel buttons
self.buttons = QtGui.QDialogButtonBox(
QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Cancel,
QtGui.QDialogButtonBox.Apply
| QtGui.QDialogButtonBox.Discard
| QtGui.QDialogButtonBox.Cancel,
QtCore.Qt.Horizontal,
self,
)
@@ -245,8 +247,16 @@ class GCodeEditorDialog(QtGui.QDialog):
if width > 0 and height > 0:
self.resize(width, height)
self.buttons.accepted.connect(self.accept)
self.buttons.rejected.connect(self.reject)
self.buttons.clicked.connect(self.clicked)
def clicked(self, button):
match self.buttons.buttonRole(button):
case QtGui.QDialogButtonBox.RejectRole:
self.done(0)
case QtGui.QDialogButtonBox.ApplyRole:
self.done(1)
case QtGui.QDialogButtonBox.DestructiveRole:
self.done(2)
def done(self, *args, **kwargs):
params = FreeCAD.ParamGet(self.paramKey)

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

@@ -275,6 +275,7 @@ def export_common(values: Values, objectslist, filename: str) -> str:
final: str
final_for_editor: str
gcode: Gcode = []
editor_result: int
for obj in objectslist:
if not hasattr(obj, "Path"):
@@ -339,12 +340,14 @@ def export_common(values: Values, objectslist, filename: str) -> str:
# the editor expects lines to end in "\n", and returns lines ending in "\n"
if values["END_OF_LINE_CHARACTERS"] == "\n":
dia.editor.setText(final)
if dia.exec_():
editor_result = dia.exec_()
if editor_result == 1:
final = dia.editor.toPlainText()
else:
final_for_editor = "\n".join(gcode)
dia.editor.setText(final_for_editor)
if dia.exec_():
editor_result = dia.exec_()
if editor_result == 1:
final_for_editor = dia.editor.toPlainText()
# convert all "\n" to the appropriate end-of-line characters
if values["END_OF_LINE_CHARACTERS"] == "\n\n":
@@ -360,21 +363,23 @@ def export_common(values: Values, objectslist, filename: str) -> str:
print("done postprocessing.")
if not filename == "-":
if final[0:2] == "\n\n":
# write out the gcode using "\n" as the end-of-line characters
with open(filename, "w", encoding="utf-8", newline="") as gfile:
gfile.write(final[2:])
elif "\r" in final:
with open(filename, "w", encoding="utf-8", newline="") as gfile:
# write out the gcode with whatever end-of-line characters it already has,
# presumably either "\r" or "\r\n"
gfile.write(final)
else:
with open(filename, "w", encoding="utf-8", newline=None) as gfile:
# The gcode has "\n" as the end-of-line characters, which means
# "write out the gcode with whatever end-of-line characters the system
# that is running the postprocessor uses".
gfile.write(final)
return final
if editor_result in [0, 1]:
if not filename == "-":
if final[0:2] == "\n\n":
# write out the gcode using "\n" as the end-of-line characters
with open(filename, "w", encoding="utf-8", newline="") as gfile:
gfile.write(final[2:])
elif "\r" in final:
with open(filename, "w", encoding="utf-8", newline="") as gfile:
# write out the gcode with whatever end-of-line characters it already has,
# presumably either "\r" or "\r\n"
gfile.write(final)
else:
with open(filename, "w", encoding="utf-8", newline=None) as gfile:
# The gcode has "\n" as the end-of-line characters, which means
# "write out the gcode with whatever end-of-line characters the system
# that is running the postprocessor uses".
gfile.write(final)
return final
else:
return None