giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- GCode Editor - closing the Editor will close also the Code Editor Tab 

- cleanup of the CNCJob UI; added a checkbox to signal if any append/prepend gcode was set in Preferences (unchecking it will override and disable the usage of the append/prepend GCode)
- the start Gcode is now stored in the CNCJob object attribute gc_start
- GCode Editor - finished adding the ability to select a row in the Tools table and select the related GCode
This commit is contained in:
Marius Stanciu 2020-08-02 16:27:30 +03:00 committed by Marius
parent 840db915f1
commit 44411cdc82
9 changed files with 411 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -7,6 +7,13 @@ CHANGELOG for FlatCAM beta
================================================= =================================================
2.08.2020
- GCode Editor - closing the Editor will close also the Code Editor Tab
- cleanup of the CNCJob UI; added a checkbox to signal if any append/prepend gcode was set in Preferences (unchecking it will override and disable the usage of the append/prepend GCode)
- the start Gcode is now stored in the CNCJob object attribute gc_start
- GCode Editor - finished adding the ability to select a row in the Tools table and select the related GCode
1.08.2020 1.08.2020
- Tools Database: added a Cutout Tool Parameters section - Tools Database: added a Cutout Tool Parameters section

2
appEditors/AppTextEditor.py
View File

@ -323,7 +323,6 @@ class AppTextEditor(QtWidgets.QWidget):
callback() callback()
def handleFindGCode(self): def handleFindGCode(self):
self.app.defaults.report_usage("handleFindGCode()")
flags = QtGui.QTextDocument.FindCaseSensitively flags = QtGui.QTextDocument.FindCaseSensitively
text_to_be_found = self.entryFind.get_value() text_to_be_found = self.entryFind.get_value()
@ -334,7 +333,6 @@ class AppTextEditor(QtWidgets.QWidget):
r = self.code_editor.find(str(text_to_be_found), flags) r = self.code_editor.find(str(text_to_be_found), flags)
def handleReplaceGCode(self): def handleReplaceGCode(self):
self.app.defaults.report_usage("handleReplaceGCode()")
old = self.entryFind.get_value() old = self.entryFind.get_value()
new = self.entryReplace.get_value() new = self.entryReplace.get_value()

151
appEditors/appGCodeEditor.py
View File

@ -59,10 +59,11 @@ class AppGCodeEditor(QtCore.QObject):
# ############# ADD a new TAB in the PLot Tab Area # ############# ADD a new TAB in the PLot Tab Area
# ############################################################################################################# # #############################################################################################################
self.ui.gcode_editor_tab = AppTextEditor(app=self.app, plain_text=True) self.ui.gcode_editor_tab = AppTextEditor(app=self.app, plain_text=True)
self.edit_area = self.ui.gcode_editor_tab.code_editor
# add the tab if it was closed # add the tab if it was closed
self.app.ui.plot_tab_area.addTab(self.ui.gcode_editor_tab, '%s' % _("Code Editor")) self.app.ui.plot_tab_area.addTab(self.ui.gcode_editor_tab, '%s' % _("Code Editor"))
self.ui.gcode_editor_tab.setObjectName('code_editor_tab') self.ui.gcode_editor_tab.setObjectName('gcode_editor_tab')
# delete the absolute and relative position and messages in the infobar # delete the absolute and relative position and messages in the infobar
self.app.ui.position_label.setText("") self.app.ui.position_label.setText("")
@ -128,11 +129,23 @@ class AppGCodeEditor(QtCore.QObject):
tool_idx = 0 tool_idx = 0
row_no = 0 row_no = 0
n = len(self.gcode_obj.cnc_tools) + 2 n = len(self.gcode_obj.cnc_tools) + 3
self.ui.cnc_tools_table.setRowCount(n) self.ui.cnc_tools_table.setRowCount(n)
# add the All Gcode selection
allgcode_item = QtWidgets.QTableWidgetItem('%s' % _("All GCode"))
allgcode_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.cnc_tools_table.setItem(row_no, 1, allgcode_item)
row_no += 1
# add the Header Gcode selection
header_item = QtWidgets.QTableWidgetItem('%s' % _("Header GCode"))
header_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.cnc_tools_table.setItem(row_no, 1, header_item)
row_no += 1
# add the Start Gcode selection # add the Start Gcode selection
start_item = QtWidgets.QTableWidgetItem('%s' % _("Header GCode")) start_item = QtWidgets.QTableWidgetItem('%s' % _("Start GCode"))
start_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) start_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.cnc_tools_table.setItem(row_no, 1, start_item) self.ui.cnc_tools_table.setItem(row_no, 1, start_item)
@ -168,11 +181,6 @@ class AppGCodeEditor(QtCore.QObject):
# ## REMEMBER: THIS COLUMN IS HIDDEN IN OBJECTUI.PY # ## # ## REMEMBER: THIS COLUMN IS HIDDEN IN OBJECTUI.PY # ##
self.ui.cnc_tools_table.setItem(row_no, 5, tool_uid_item) # Tool unique ID) self.ui.cnc_tools_table.setItem(row_no, 5, tool_uid_item) # Tool unique ID)
# add the All Gcode selection
end_item = QtWidgets.QTableWidgetItem('%s' % _("All GCode"))
end_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.cnc_tools_table.setItem(row_no + 1, 1, end_item)
self.ui.cnc_tools_table.resizeColumnsToContents() self.ui.cnc_tools_table.resizeColumnsToContents()
self.ui.cnc_tools_table.resizeRowsToContents() self.ui.cnc_tools_table.resizeRowsToContents()
@ -213,11 +221,23 @@ class AppGCodeEditor(QtCore.QObject):
tool_idx = 0 tool_idx = 0
row_no = 0 row_no = 0
n = len(self.gcode_obj.exc_cnc_tools) + 2 n = len(self.gcode_obj.exc_cnc_tools) + 3
self.ui.exc_cnc_tools_table.setRowCount(n) self.ui.exc_cnc_tools_table.setRowCount(n)
# add the All Gcode selection
allgcode_item = QtWidgets.QTableWidgetItem('%s' % _("All GCode"))
allgcode_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.exc_cnc_tools_table.setItem(row_no, 1, allgcode_item)
row_no += 1
# add the Header Gcode selection
header_item = QtWidgets.QTableWidgetItem('%s' % _("Header GCode"))
header_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.exc_cnc_tools_table.setItem(row_no, 1, header_item)
row_no += 1
# add the Start Gcode selection # add the Start Gcode selection
start_item = QtWidgets.QTableWidgetItem('%s' % _("Header GCode")) start_item = QtWidgets.QTableWidgetItem('%s' % _("Start GCode"))
start_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) start_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.exc_cnc_tools_table.setItem(row_no, 1, start_item) self.ui.exc_cnc_tools_table.setItem(row_no, 1, start_item)
@ -249,11 +269,6 @@ class AppGCodeEditor(QtCore.QObject):
self.ui.exc_cnc_tools_table.setItem(row_no, 4, tool_uid_item) # Tool unique ID) self.ui.exc_cnc_tools_table.setItem(row_no, 4, tool_uid_item) # Tool unique ID)
self.ui.exc_cnc_tools_table.setItem(row_no, 5, cutz_item) self.ui.exc_cnc_tools_table.setItem(row_no, 5, cutz_item)
# add the All Gcode selection
end_item = QtWidgets.QTableWidgetItem('%s' % _("All GCode"))
end_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.exc_cnc_tools_table.setItem(row_no + 1, 1, end_item)
self.ui.exc_cnc_tools_table.resizeColumnsToContents() self.ui.exc_cnc_tools_table.resizeColumnsToContents()
self.ui.exc_cnc_tools_table.resizeRowsToContents() self.ui.exc_cnc_tools_table.resizeRowsToContents()
@ -327,12 +342,17 @@ class AppGCodeEditor(QtCore.QObject):
:return: :return:
:rtype: :rtype:
""" """
flags = QtGui.QTextDocument.FindCaseSensitively
self.edit_area.moveCursor(QtGui.QTextCursor.Start)
if self.gcode_obj.cnc_tools: if self.gcode_obj.cnc_tools:
sel_model = self.ui.cnc_tools_table.selectionModel() t_table = self.ui.cnc_tools_table
elif self.gcode_obj.exc_cnc_tools: elif self.gcode_obj.exc_cnc_tools:
sel_model = self.ui.exc_cnc_tools_table.selectionModel() t_table = self.ui.exc_cnc_tools_table
else: else:
return return
sel_model = t_table.selectionModel()
sel_indexes = sel_model.selectedIndexes() sel_indexes = sel_model.selectedIndexes()
# it will iterate over all indexes which means all items in all columns too but I'm interested only on rows # it will iterate over all indexes which means all items in all columns too but I'm interested only on rows
@ -340,6 +360,81 @@ class AppGCodeEditor(QtCore.QObject):
for idx in sel_indexes: for idx in sel_indexes:
sel_rows.add(idx.row()) sel_rows.add(idx.row())
if 0 in sel_rows:
self.edit_area.selectAll()
return
if 1 in sel_rows:
text_to_be_found = self.gcode_obj.gc_header
text_list = [x for x in text_to_be_found.split("\n") if x != '']
self.edit_area.find(str(text_list[0]), flags)
my_text_cursor = self.edit_area.textCursor()
start_sel = my_text_cursor.selectionStart()
end_sel = 0
while True:
f = self.edit_area.find(str(text_list[-1]), flags)
if f is False:
break
my_text_cursor = self.edit_area.textCursor()
end_sel = my_text_cursor.selectionEnd()
my_text_cursor.setPosition(start_sel)
my_text_cursor.setPosition(end_sel, QtGui.QTextCursor.KeepAnchor)
self.edit_area.setTextCursor(my_text_cursor)
if 2 in sel_rows:
text_to_be_found = self.gcode_obj.gc_start
text_list = [x for x in text_to_be_found.split("\n") if x != '']
self.edit_area.find(str(text_list[0]), flags)
my_text_cursor = self.edit_area.textCursor()
start_sel = my_text_cursor.selectionStart()
end_sel = 0
while True:
f = self.edit_area.find(str(text_list[-1]), flags)
if f is False:
break
my_text_cursor = self.edit_area.textCursor()
end_sel = my_text_cursor.selectionEnd()
my_text_cursor.setPosition(start_sel)
my_text_cursor.setPosition(end_sel, QtGui.QTextCursor.KeepAnchor)
self.edit_area.setTextCursor(my_text_cursor)
for row in sel_rows:
# those are special rows treated before so we except them
if row not in [0, 1, 2]:
if self.gcode_obj.cnc_tools:
tool_no = int(t_table.item(row, 0).text())
text_to_be_found = self.gcode_obj.cnc_tools[tool_no]['gcode']
elif self.gcode_obj.exc_cnc_tools:
tool_dia = float(t_table.item(row, 1).text())
text_to_be_found = self.gcode_obj.exc_cnc_tools[tool_dia]['gcode']
else:
return
text_list = [x for x in text_to_be_found.split("\n") if x != '']
self.edit_area.find(str(text_list[0]), flags)
my_text_cursor = self.edit_area.textCursor()
start_sel = my_text_cursor.selectionStart()
end_sel = 0
while True:
f = self.edit_area.find(str(text_list[-1]), flags)
if f is False:
break
my_text_cursor = self.edit_area.textCursor()
end_sel = my_text_cursor.selectionEnd()
my_text_cursor.setPosition(start_sel)
my_text_cursor.setPosition(end_sel, QtGui.QTextCursor.KeepAnchor)
self.edit_area.setTextCursor(my_text_cursor)
def on_toggle_all_rows(self): def on_toggle_all_rows(self):
""" """
@ -347,11 +442,13 @@ class AppGCodeEditor(QtCore.QObject):
:rtype: :rtype:
""" """
if self.gcode_obj.cnc_tools: if self.gcode_obj.cnc_tools:
sel_model = self.ui.cnc_tools_table.selectionModel() t_table = self.ui.cnc_tools_table
elif self.gcode_obj.exc_cnc_tools: elif self.gcode_obj.exc_cnc_tools:
sel_model = self.ui.exc_cnc_tools_table.selectionModel() t_table = self.ui.exc_cnc_tools_table
else: else:
return return
sel_model = t_table.selectionModel()
sel_indexes = sel_model.selectedIndexes() sel_indexes = sel_model.selectedIndexes()
# it will iterate over all indexes which means all items in all columns too but I'm interested only on rows # it will iterate over all indexes which means all items in all columns too but I'm interested only on rows
@ -359,18 +456,12 @@ class AppGCodeEditor(QtCore.QObject):
for idx in sel_indexes: for idx in sel_indexes:
sel_rows.add(idx.row()) sel_rows.add(idx.row())
if self.gcode_obj.cnc_tools: if len(sel_rows) == t_table.rowCount():
if len(sel_rows) == self.ui.cnc_tools_table.rowCount(): t_table.clearSelection()
self.ui.cnc_tools_table.clearSelection() my_text_cursor = self.edit_area.textCursor()
else: my_text_cursor.clearSelection()
self.ui.cnc_tools_table.selectAll()
elif self.gcode_obj.exc_cnc_tools:
if len(sel_rows) == self.ui.exc_cnc_tools_table.rowCount():
self.ui.exc_cnc_tools_table.clearSelection()
else:
self.ui.exc_cnc_tools_table.selectAll()
else: else:
return t_table.selectAll()
def handleTextChanged(self): def handleTextChanged(self):
""" """

248
appGUI/ObjectUI.py
View File

@ -1889,6 +1889,14 @@ class CNCObjectUI(ObjectUI):
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken) separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
self.custom_box.addWidget(separator_line) self.custom_box.addWidget(separator_line)
# CNC Code snippets
self.snippets_cb = FCCheckBox(_("Use CNC Code Snippets"))
self.snippets_cb.setToolTip(
_("When selected, it will include CNC Code snippets (append and prepend)\n"
"defined in the Preferences.")
)
self.custom_box.addWidget(self.snippets_cb)
# #################### # ####################
# ## Export G-Code ## # ## Export G-Code ##
# #################### # ####################
@ -1899,128 +1907,128 @@ class CNCObjectUI(ObjectUI):
) )
self.custom_box.addWidget(self.export_gcode_label) self.custom_box.addWidget(self.export_gcode_label)
# Prepend text to GCode # # Prepend text to GCode
prependlabel = QtWidgets.QLabel('%s:' % _('Prepend to CNC Code')) # prependlabel = QtWidgets.QLabel('%s:' % _('Prepend to CNC Code'))
prependlabel.setToolTip( # prependlabel.setToolTip(
_("Type here any G-Code commands you would\n" # _("Type here any G-Code commands you would\n"
"like to add at the beginning of the G-Code file.") # "like to add at the beginning of the G-Code file.")
) # )
self.custom_box.addWidget(prependlabel) # self.custom_box.addWidget(prependlabel)
#
self.prepend_text = FCTextArea() # self.prepend_text = FCTextArea()
self.prepend_text.setPlaceholderText( # self.prepend_text.setPlaceholderText(
_("Type here any G-Code commands you would\n" # _("Type here any G-Code commands you would\n"
"like to add at the beginning of the G-Code file.") # "like to add at the beginning of the G-Code file.")
) # )
self.custom_box.addWidget(self.prepend_text) # self.custom_box.addWidget(self.prepend_text)
#
# Append text to GCode # # Append text to GCode
appendlabel = QtWidgets.QLabel('%s:' % _('Append to CNC Code')) # appendlabel = QtWidgets.QLabel('%s:' % _('Append to CNC Code'))
appendlabel.setToolTip( # appendlabel.setToolTip(
_("Type here any G-Code commands you would\n" # _("Type here any G-Code commands you would\n"
"like to append to the generated file.\n" # "like to append to the generated file.\n"
"I.e.: M2 (End of program)") # "I.e.: M2 (End of program)")
) # )
self.custom_box.addWidget(appendlabel) # self.custom_box.addWidget(appendlabel)
#
self.append_text = FCTextArea() # self.append_text = FCTextArea()
self.append_text.setPlaceholderText( # self.append_text.setPlaceholderText(
_("Type here any G-Code commands you would\n" # _("Type here any G-Code commands you would\n"
"like to append to the generated file.\n" # "like to append to the generated file.\n"
"I.e.: M2 (End of program)") # "I.e.: M2 (End of program)")
) # )
self.custom_box.addWidget(self.append_text) # self.custom_box.addWidget(self.append_text)
#
self.cnc_frame = QtWidgets.QFrame() # self.cnc_frame = QtWidgets.QFrame()
self.cnc_frame.setContentsMargins(0, 0, 0, 0) # self.cnc_frame.setContentsMargins(0, 0, 0, 0)
self.custom_box.addWidget(self.cnc_frame) # self.custom_box.addWidget(self.cnc_frame)
self.cnc_box = QtWidgets.QVBoxLayout() # self.cnc_box = QtWidgets.QVBoxLayout()
self.cnc_box.setContentsMargins(0, 0, 0, 0) # self.cnc_box.setContentsMargins(0, 0, 0, 0)
self.cnc_frame.setLayout(self.cnc_box) # self.cnc_frame.setLayout(self.cnc_box)
#
# Toolchange Custom G-Code # # Toolchange Custom G-Code
self.toolchangelabel = QtWidgets.QLabel('%s:' % _('Toolchange G-Code')) # self.toolchangelabel = QtWidgets.QLabel('%s:' % _('Toolchange G-Code'))
self.toolchangelabel.setToolTip( # self.toolchangelabel.setToolTip(
_( # _(
"Type here any G-Code commands you would\n" # "Type here any G-Code commands you would\n"
"like to be executed when Toolchange event is encountered.\n" # "like to be executed when Toolchange event is encountered.\n"
"This will constitute a Custom Toolchange GCode,\n" # "This will constitute a Custom Toolchange GCode,\n"
"or a Toolchange Macro.\n" # "or a Toolchange Macro.\n"
"The FlatCAM variables are surrounded by '%' symbol.\n\n" # "The FlatCAM variables are surrounded by '%' symbol.\n\n"
"WARNING: it can be used only with a preprocessor file\n" # "WARNING: it can be used only with a preprocessor file\n"
"that has 'toolchange_custom' in it's name and this is built\n" # "that has 'toolchange_custom' in it's name and this is built\n"
"having as template the 'Toolchange Custom' posprocessor file." # "having as template the 'Toolchange Custom' posprocessor file."
) # )
) # )
self.cnc_box.addWidget(self.toolchangelabel) # self.cnc_box.addWidget(self.toolchangelabel)
#
self.toolchange_text = FCTextArea() # self.toolchange_text = FCTextArea()
self.toolchange_text.setPlaceholderText( # self.toolchange_text.setPlaceholderText(
_( # _(
"Type here any G-Code commands you would\n" # "Type here any G-Code commands you would\n"
"like to be executed when Toolchange event is encountered.\n" # "like to be executed when Toolchange event is encountered.\n"
"This will constitute a Custom Toolchange GCode,\n" # "This will constitute a Custom Toolchange GCode,\n"
"or a Toolchange Macro.\n" # "or a Toolchange Macro.\n"
"The FlatCAM variables are surrounded by '%' symbol.\n" # "The FlatCAM variables are surrounded by '%' symbol.\n"
"WARNING: it can be used only with a preprocessor file\n" # "WARNING: it can be used only with a preprocessor file\n"
"that has 'toolchange_custom' in it's name." # "that has 'toolchange_custom' in it's name."
) # )
) # )
self.cnc_box.addWidget(self.toolchange_text) # self.cnc_box.addWidget(self.toolchange_text)
#
cnclay = QtWidgets.QHBoxLayout() # cnclay = QtWidgets.QHBoxLayout()
self.cnc_box.addLayout(cnclay) # self.cnc_box.addLayout(cnclay)
#
# Toolchange Replacement Enable # # Toolchange Replacement Enable
self.toolchange_cb = FCCheckBox(label='%s' % _('Use Toolchange Macro')) # self.toolchange_cb = FCCheckBox(label='%s' % _('Use Toolchange Macro'))
self.toolchange_cb.setToolTip( # self.toolchange_cb.setToolTip(
_("Check this box if you want to use\n" # _("Check this box if you want to use\n"
"a Custom Toolchange GCode (macro).") # "a Custom Toolchange GCode (macro).")
) # )
#
# Variable list # # Variable list
self.tc_variable_combo = FCComboBox() # self.tc_variable_combo = FCComboBox()
self.tc_variable_combo.setToolTip( # self.tc_variable_combo.setToolTip(
_( # _(
"A list of the FlatCAM variables that can be used\n" # "A list of the FlatCAM variables that can be used\n"
"in the Toolchange event.\n" # "in the Toolchange event.\n"
"They have to be surrounded by the '%' symbol" # "They have to be surrounded by the '%' symbol"
) # )
) # )
#
# Populate the Combo Box # # Populate the Combo Box
variables = [_('Parameters'), 'tool', 'tooldia', 't_drills', 'x_toolchange', 'y_toolchange', 'z_toolchange', # variables = [_('Parameters'), 'tool', 'tooldia', 't_drills', 'x_toolchange', 'y_toolchange', 'z_toolchange',
'z_cut', 'z_move', 'z_depthpercut', 'spindlespeed', 'dwelltime'] # 'z_cut', 'z_move', 'z_depthpercut', 'spindlespeed', 'dwelltime']
self.tc_variable_combo.addItems(variables) # self.tc_variable_combo.addItems(variables)
self.tc_variable_combo.setItemData(0, _("FlatCAM CNC parameters"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(0, _("FlatCAM CNC parameters"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(1, "tool = " + _("tool number"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(1, "tool = " + _("tool number"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(2, "tooldia = " + _("tool diameter"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(2, "tooldia = " + _("tool diameter"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(3, "t_drills = " + _("for Excellon, total number of drills"), # self.tc_variable_combo.setItemData(3, "t_drills = " + _("for Excellon, total number of drills"),
Qt.ToolTipRole) # Qt.ToolTipRole)
self.tc_variable_combo.setItemData(4, "x_toolchange = " + _("X coord for Toolchange"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(4, "x_toolchange = " + _("X coord for Toolchange"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(5, "y_toolchange = " + _("Y coord for Toolchange"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(5, "y_toolchange = " + _("Y coord for Toolchange"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(6, "z_toolchange = " + _("Z coord for Toolchange"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(6, "z_toolchange = " + _("Z coord for Toolchange"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(7, "z_cut = " + _("depth where to cut"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(7, "z_cut = " + _("depth where to cut"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(8, "z_move = " + _("height where to travel"), Qt.ToolTipRole) # self.tc_variable_combo.setItemData(8, "z_move = " + _("height where to travel"), Qt.ToolTipRole)
self.tc_variable_combo.setItemData(9, "z_depthpercut = " + _("the step value for multidepth cut"), # self.tc_variable_combo.setItemData(9, "z_depthpercut = " + _("the step value for multidepth cut"),
Qt.ToolTipRole) # Qt.ToolTipRole)
self.tc_variable_combo.setItemData(10, "spindlesspeed = " + _("the value for the spindle speed"), # self.tc_variable_combo.setItemData(10, "spindlesspeed = " + _("the value for the spindle speed"),
Qt.ToolTipRole) # Qt.ToolTipRole)
self.tc_variable_combo.setItemData(11, "dwelltime = " + _("time to dwell to allow the " # self.tc_variable_combo.setItemData(11, "dwelltime = " + _("time to dwell to allow the "
"spindle to reach it's set RPM"), # "spindle to reach it's set RPM"),
Qt.ToolTipRole) # Qt.ToolTipRole)
#
cnclay.addWidget(self.toolchange_cb) # cnclay.addWidget(self.toolchange_cb)
cnclay.addStretch() # cnclay.addStretch()
cnclay.addWidget(self.tc_variable_combo) # cnclay.addWidget(self.tc_variable_combo)
#
self.toolch_ois = OptionalInputSection(self.toolchange_cb, # self.toolch_ois = OptionalInputSection(self.toolchange_cb,
[self.toolchangelabel, self.toolchange_text, self.tc_variable_combo]) # [self.toolchangelabel, self.toolchange_text, self.tc_variable_combo])
#
h_lay = QtWidgets.QHBoxLayout() h_lay = QtWidgets.QHBoxLayout()
h_lay.setAlignment(QtCore.Qt.AlignVCenter) h_lay.setAlignment(QtCore.Qt.AlignVCenter)
self.custom_box.addLayout(h_lay) self.custom_box.addLayout(h_lay)
#
# # Edit GCode Button # # Edit GCode Button
# self.modify_gcode_button = QtWidgets.QPushButton(_('View CNC Code')) # self.modify_gcode_button = QtWidgets.QPushButton(_('View CNC Code'))
# self.modify_gcode_button.setToolTip( # self.modify_gcode_button.setToolTip(
@ -2028,7 +2036,7 @@ class CNCObjectUI(ObjectUI):
# "file.") # "file.")
# ) # )
# GO Button # Save Button
self.export_gcode_button = QtWidgets.QPushButton(_('Save CNC Code')) self.export_gcode_button = QtWidgets.QPushButton(_('Save CNC Code'))
self.export_gcode_button.setIcon(QtGui.QIcon(self.app.resource_location + '/save_as.png')) self.export_gcode_button.setIcon(QtGui.QIcon(self.app.resource_location + '/save_as.png'))
self.export_gcode_button.setToolTip( self.export_gcode_button.setToolTip(

184
appObjects/FlatCAMCNCJob.py
View File

@ -63,8 +63,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
"dwell": False, "dwell": False,
"dwelltime": 1, "dwelltime": 1,
"type": 'Geometry', "type": 'Geometry',
"toolchange_macro": '', # "toolchange_macro": '',
"toolchange_macro_enable": False # "toolchange_macro_enable": False
}) })
''' '''
@ -137,11 +137,6 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcodenr_re_string = r'([+-]?\d*\.\d+)' gcodenr_re_string = r'([+-]?\d*\.\d+)'
self.g_nr_re = re.compile(gcodenr_re_string) self.g_nr_re = re.compile(gcodenr_re_string)
# Attributes to be included in serialization
# Always append to it because it carries contents
# from predecessors.
self.ser_attrs += ['options', 'kind', 'origin_kind', 'cnc_tools', 'exc_cnc_tools', 'multitool']
if self.app.is_legacy is False: if self.app.is_legacy is False:
self.text_col = self.app.plotcanvas.new_text_collection() self.text_col = self.app.plotcanvas.new_text_collection()
self.text_col.enabled = True self.text_col.enabled = True
@ -152,6 +147,19 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.source_file = '' self.source_file = ''
self.units_found = self.app.defaults['units'] self.units_found = self.app.defaults['units']
self.append_snippet = ''
self.prepend_snippet = ''
self.gc_header = self.gcode_header()
self.gc_start = ''
# Attributes to be included in serialization
# Always append to it because it carries contents
# from predecessors.
self.ser_attrs += [
'options', 'kind', 'origin_kind', 'cnc_tools', 'exc_cnc_tools', 'multitool', 'append_snippet',
'prepend_snippet', 'gc_header'
]
def build_ui(self): def build_ui(self):
self.ui_disconnect() self.ui_disconnect()
@ -364,17 +372,23 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# this signal has to be connected to it's slot before the defaults are populated # this signal has to be connected to it's slot before the defaults are populated
# the decision done in the slot has to override the default value set below # the decision done in the slot has to override the default value set below
self.ui.toolchange_cb.toggled.connect(self.on_toolchange_custom_clicked) # self.ui.toolchange_cb.toggled.connect(self.on_toolchange_custom_clicked)
self.form_fields.update({ self.form_fields.update({
"plot": self.ui.plot_cb, "plot": self.ui.plot_cb,
"tooldia": self.ui.tooldia_entry, "tooldia": self.ui.tooldia_entry,
"append": self.ui.append_text, # "append": self.ui.append_text,
"prepend": self.ui.prepend_text, # "prepend": self.ui.prepend_text,
"toolchange_macro": self.ui.toolchange_text, # "toolchange_macro": self.ui.toolchange_text,
"toolchange_macro_enable": self.ui.toolchange_cb # "toolchange_macro_enable": self.ui.toolchange_cb
}) })
self.append_snippet = self.app.defaults['cncjob_append']
self.prepend_snippet = self.app.defaults['cncjob_prepend']
if self.append_snippet != '' or self.prepend_snippet:
self.ui.snippets_cb.set_value(True)
# Fill form fields only on object create # Fill form fields only on object create
self.to_form() self.to_form()
@ -428,26 +442,31 @@ class CNCJobObject(FlatCAMObj, CNCjob):
'<span style="color:green;"><b>Basic</b></span>' '<span style="color:green;"><b>Basic</b></span>'
)) ))
self.ui.cnc_frame.hide() # self.ui.cnc_frame.hide()
else: else:
self.ui.level.setText(_( self.ui.level.setText(_(
'<span style="color:red;"><b>Advanced</b></span>' '<span style="color:red;"><b>Advanced</b></span>'
)) ))
self.ui.cnc_frame.show() # self.ui.cnc_frame.show()
self.ui.updateplot_button.clicked.connect(self.on_updateplot_button_click) self.ui.updateplot_button.clicked.connect(self.on_updateplot_button_click)
self.ui.export_gcode_button.clicked.connect(self.on_exportgcode_button_click) self.ui.export_gcode_button.clicked.connect(self.on_exportgcode_button_click)
self.ui.editor_button.clicked.connect(self.on_edit_code_click) self.ui.editor_button.clicked.connect(self.on_edit_code_click)
self.ui.tc_variable_combo.currentIndexChanged[str].connect(self.on_cnc_custom_parameters) # self.ui.tc_variable_combo.currentIndexChanged[str].connect(self.on_cnc_custom_parameters)
self.ui.cncplot_method_combo.activated_custom.connect(self.on_plot_kind_change) self.ui.cncplot_method_combo.activated_custom.connect(self.on_plot_kind_change)
def on_cnc_custom_parameters(self, signal_text): preamble = self.append_snippet
if signal_text == 'Parameters': postamble = self.prepend_snippet
return gc = self.export_gcode(preamble=preamble, postamble=postamble, to_file=True)
else: self.source_file = gc.getvalue()
self.ui.toolchange_text.insertPlainText('%%%s%%' % signal_text)
# def on_cnc_custom_parameters(self, signal_text):
# if signal_text == 'Parameters':
# return
# else:
# self.ui.toolchange_text.insertPlainText('%%%s%%' % signal_text)
def ui_connect(self): def ui_connect(self):
for row in range(self.ui.cnc_tools_table.rowCount()): for row in range(self.ui.cnc_tools_table.rowCount()):
@ -525,6 +544,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.export_gcode_handler(filename, is_gcode=save_gcode) self.export_gcode_handler(filename, is_gcode=save_gcode)
def export_gcode_handler(self, filename, is_gcode=True): def export_gcode_handler(self, filename, is_gcode=True):
preamble = ''
postamble = ''
filename = str(filename) filename = str(filename)
if filename == '': if filename == '':
@ -540,8 +561,9 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.on_name_activate(silent=True) self.on_name_activate(silent=True)
try: try:
preamble = str(self.ui.prepend_text.get_value()) if self.ui.snippets_cb.get_value():
postamble = str(self.ui.append_text.get_value()) preamble = self.append_snippet
postamble = self.prepend_snippet
gc = self.export_gcode(filename, preamble=preamble, postamble=postamble) gc = self.export_gcode(filename, preamble=preamble, postamble=postamble)
except Exception as err: except Exception as err:
log.debug("CNCJobObject.export_gcode_handler() --> %s" % str(err)) log.debug("CNCJobObject.export_gcode_handler() --> %s" % str(err))
@ -565,8 +587,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.app.proc_container.view.set_busy(_("Loading...")) self.app.proc_container.view.set_busy(_("Loading..."))
preamble = str(self.ui.prepend_text.get_value()) preamble = self.append_snippet
postamble = str(self.ui.append_text.get_value()) postamble = self.prepend_snippet
gco = self.export_gcode(preamble=preamble, postamble=postamble, to_file=True) gco = self.export_gcode(preamble=preamble, postamble=postamble, to_file=True)
if gco == 'fail': if gco == 'fail':
@ -622,6 +644,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
marlin = False marlin = False
hpgl = False hpgl = False
probe_pp = False probe_pp = False
gcode = ''
start_comment = comment_start_symbol if comment_start_symbol is not None else '(' start_comment = comment_start_symbol if comment_start_symbol is not None else '('
stop_comment = comment_stop_symbol if comment_stop_symbol is not None else ')' stop_comment = comment_stop_symbol if comment_stop_symbol is not None else ')'
@ -657,8 +680,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
pass pass
if marlin is True: if marlin is True:
gcode = ';Marlin(Repetier) G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \ gcode += ';Marlin(Repetier) G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \
(str(self.app.version), str(self.app.version_date)) + '\n' (str(self.app.version), str(self.app.version_date)) + '\n'
gcode += ';Name: ' + str(self.options['name']) + '\n' gcode += ';Name: ' + str(self.options['name']) + '\n'
gcode += ';Type: ' + "G-code from " + str(self.options['type']) + '\n' gcode += ';Type: ' + "G-code from " + str(self.options['type']) + '\n'
@ -669,8 +692,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcode += ';Units: ' + self.units.upper() + '\n' + "\n" gcode += ';Units: ' + self.units.upper() + '\n' + "\n"
gcode += ';Created on ' + time_str + '\n' + '\n' gcode += ';Created on ' + time_str + '\n' + '\n'
elif hpgl is True: elif hpgl is True:
gcode = 'CO "HPGL CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s' % \ gcode += 'CO "HPGL CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s' % \
(str(self.app.version), str(self.app.version_date)) + '";\n' (str(self.app.version), str(self.app.version_date)) + '";\n'
gcode += 'CO "Name: ' + str(self.options['name']) + '";\n' gcode += 'CO "Name: ' + str(self.options['name']) + '";\n'
gcode += 'CO "Type: ' + "HPGL code from " + str(self.options['type']) + '";\n' gcode += 'CO "Type: ' + "HPGL code from " + str(self.options['type']) + '";\n'
@ -681,8 +704,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcode += 'CO "Units: ' + self.units.upper() + '";\n' gcode += 'CO "Units: ' + self.units.upper() + '";\n'
gcode += 'CO "Created on ' + time_str + '";\n' gcode += 'CO "Created on ' + time_str + '";\n'
elif probe_pp is True: elif probe_pp is True:
gcode = '(G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s)\n' % \ gcode += '(G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s)\n' % \
(str(self.app.version), str(self.app.version_date)) + '\n' (str(self.app.version), str(self.app.version_date)) + '\n'
gcode += '(This GCode tool change is done by using a Probe.)\n' \ gcode += '(This GCode tool change is done by using a Probe.)\n' \
'(Make sure that before you start the job you first do a rough zero for Z axis.)\n' \ '(Make sure that before you start the job you first do a rough zero for Z axis.)\n' \
@ -699,8 +722,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcode += '(Units: ' + self.units.upper() + ')\n' + "\n" gcode += '(Units: ' + self.units.upper() + ')\n' + "\n"
gcode += '(Created on ' + time_str + ')\n' + '\n' gcode += '(Created on ' + time_str + ')\n' + '\n'
else: else:
gcode = '%sG-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s%s\n' % \ gcode += '%sG-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s%s\n' % \
(start_comment, str(self.app.version), str(self.app.version_date), stop_comment) + '\n' (start_comment, str(self.app.version), str(self.app.version_date), stop_comment) + '\n'
gcode += '%sName: ' % start_comment + str(self.options['name']) + '%s\n' % stop_comment gcode += '%sName: ' % start_comment + str(self.options['name']) + '%s\n' % stop_comment
gcode += '%sType: ' % start_comment + "G-code from " + str(self.options['type']) + '%s\n' % stop_comment gcode += '%sType: ' % start_comment + "G-code from " + str(self.options['type']) + '%s\n' % stop_comment
@ -847,31 +870,40 @@ class CNCJobObject(FlatCAMObj, CNCjob):
processed_gcode += gline + '\n' processed_gcode += gline + '\n'
gcode = processed_gcode gcode = processed_gcode
g = self.gcode_header() + '\n' + preamble + '\n' + gcode + postamble + end_gcode g = self.gc_header + '\n' + preamble + '\n' + gcode + postamble + end_gcode
else: else:
try: try:
g_idx = gcode.index('G94') g_idx = gcode.index('G94')
g = self.gcode_header() + gcode[:g_idx + 3] + '\n\n' + preamble + '\n' + \ if preamble != '' and postamble != '':
gcode[(g_idx + 3):] + postamble + end_gcode g = self.gc_header + gcode[:g_idx + 3] + '\n' + preamble + '\n' + \
gcode[(g_idx + 3):] + postamble + end_gcode
elif preamble == '':
g = self.gc_header + gcode[:g_idx + 3] + '\n' + \
gcode[(g_idx + 3):] + postamble + end_gcode
elif postamble == '':
g = self.gc_header + gcode[:g_idx + 3] + '\n' + preamble + '\n' + \
gcode[(g_idx + 3):] + end_gcode
else:
g = self.gc_header + gcode[:g_idx + 3] + gcode[(g_idx + 3):] + end_gcode
except ValueError: except ValueError:
self.app.inform.emit('[ERROR_NOTCL] %s' % self.app.inform.emit('[ERROR_NOTCL] %s' %
_("G-code does not have a G94 code and we will not include the code in the " _("G-code does not have a G94 code.\n"
"'Prepend to GCode' text box")) "Append Code snippet will not be used.."))
g = self.gcode_header() + '\n' + gcode + postamble + end_gcode g = self.gc_header + '\n' + gcode + postamble + end_gcode
# if toolchange custom is used, replace M6 code with the code from the Toolchange Custom Text box # if toolchange custom is used, replace M6 code with the code from the Toolchange Custom Text box
if self.ui.toolchange_cb.get_value() is True: # if self.ui.toolchange_cb.get_value() is True:
# match = self.re_toolchange.search(g) # # match = self.re_toolchange.search(g)
if 'M6' in g: # if 'M6' in g:
m6_code = self.parse_custom_toolchange_code(self.ui.toolchange_text.get_value()) # m6_code = self.parse_custom_toolchange_code(self.ui.toolchange_text.get_value())
if m6_code is None or m6_code == '': # if m6_code is None or m6_code == '':
self.app.inform.emit( # self.app.inform.emit(
'[ERROR_NOTCL] %s' % _("Cancelled. The Toolchange Custom code is enabled but it's empty.") # '[ERROR_NOTCL] %s' % _("Cancelled. The Toolchange Custom code is enabled but it's empty.")
) # )
return 'fail' # return 'fail'
#
g = g.replace('M6', m6_code) # g = g.replace('M6', m6_code)
self.app.inform.emit('[success] %s' % _("Toolchange G-code was replaced by a custom code.")) # self.app.inform.emit('[success] %s' % _("Toolchange G-code was replaced by a custom code."))
lines = StringIO(g) lines = StringIO(g)
@ -906,32 +938,32 @@ class CNCJobObject(FlatCAMObj, CNCjob):
else: else:
return lines return lines
def on_toolchange_custom_clicked(self, signal): # def on_toolchange_custom_clicked(self, signal):
""" # """
Handler for clicking toolchange custom. # Handler for clicking toolchange custom.
#
:param signal: # :param signal:
:return: # :return:
""" # """
#
try: # try:
if 'toolchange_custom' not in str(self.options['ppname_e']).lower(): # if 'toolchange_custom' not in str(self.options['ppname_e']).lower():
if self.ui.toolchange_cb.get_value(): # if self.ui.toolchange_cb.get_value():
self.ui.toolchange_cb.set_value(False) # self.ui.toolchange_cb.set_value(False)
self.app.inform.emit('[WARNING_NOTCL] %s' % # self.app.inform.emit('[WARNING_NOTCL] %s' %
_("The used preprocessor file has to have in it's name: 'toolchange_custom'")) # _("The used preprocessor file has to have in it's name: 'toolchange_custom'"))
except KeyError: # except KeyError:
try: # try:
for key in self.cnc_tools: # for key in self.cnc_tools:
ppg = self.cnc_tools[key]['data']['ppname_g'] # ppg = self.cnc_tools[key]['data']['ppname_g']
if 'toolchange_custom' not in str(ppg).lower(): # if 'toolchange_custom' not in str(ppg).lower():
if self.ui.toolchange_cb.get_value(): # if self.ui.toolchange_cb.get_value():
self.ui.toolchange_cb.set_value(False) # self.ui.toolchange_cb.set_value(False)
self.app.inform.emit('[WARNING_NOTCL] %s' % # self.app.inform.emit('[WARNING_NOTCL] %s' %
_("The used preprocessor file has to have in it's name: " # _("The used preprocessor file has to have in it's name: "
"'toolchange_custom'")) # "'toolchange_custom'"))
except KeyError: # except KeyError:
self.app.inform.emit('[ERROR] %s' % _("There is no preprocessor file.")) # self.app.inform.emit('[ERROR] %s' % _("There is no preprocessor file."))
def get_gcode(self, preamble='', postamble=''): def get_gcode(self, preamble='', postamble=''):
""" """

20
appObjects/FlatCAMGeometry.py
View File

@ -2109,21 +2109,14 @@ class GeometryObject(FlatCAMObj, Geometry):
# it seems that the tolerance needs to be a lot lower value than 0.01 and it was hardcoded initially # it seems that the tolerance needs to be a lot lower value than 0.01 and it was hardcoded initially
# to a value of 0.0005 which is 20 times less than 0.01 # to a value of 0.0005 which is 20 times less than 0.01
tol = float(self.app.defaults['global_tolerance']) / 20 tol = float(self.app.defaults['global_tolerance']) / 20
# res = job_obj.generate_from_multitool_geometry(
# tool_solid_geometry, tooldia=tooldia_val, offset=tool_offset,
# tolerance=tol, z_cut=z_cut, z_move=z_move,
# feedrate=feedrate, feedrate_z=feedrate_z, feedrate_rapid=feedrate_rapid,
# spindlespeed=spindlespeed, spindledir=spindledir, dwell=dwell, dwelltime=dwelltime,
# multidepth=multidepth, depthpercut=depthpercut,
# extracut=extracut, extracut_length=extracut_length, startz=startz, endz=endz, endxy=endxy,
# toolchange=toolchange, toolchangez=toolchangez, toolchangexy=toolchangexy,
# pp_geometry_name=pp_geometry_name,
# tool_no=tool_cnt)
tool_lst = list(tools_dict.keys()) tool_lst = list(tools_dict.keys())
is_first = True if tooluid_key == tool_lst[0] else False is_first = True if tooluid_key == tool_lst[0] else False
is_last = True if tooluid_key == tool_lst[-1] else False is_last = True if tooluid_key == tool_lst[-1] else False
res = job_obj.geometry_tool_gcode_gen(tooluid_key, tools_dict, first_pt=(0, 0), tolerance = tol, res, start_gcode = job_obj.geometry_tool_gcode_gen(tooluid_key, tools_dict, first_pt=(0, 0),
is_first=is_first, is_last=is_last, toolchange = True) tolerance = tol,
is_first=is_first, is_last=is_last,
toolchange = True)
if res == 'fail': if res == 'fail':
log.debug("GeometryObject.mtool_gen_cncjob() --> generate_from_geometry2() failed") log.debug("GeometryObject.mtool_gen_cncjob() --> generate_from_geometry2() failed")
return 'fail' return 'fail'
@ -2131,6 +2124,9 @@ class GeometryObject(FlatCAMObj, Geometry):
dia_cnc_dict['gcode'] = res dia_cnc_dict['gcode'] = res
total_gcode += res total_gcode += res
if start_gcode != '':
job_obj.gc_start = start_gcode
self.app.inform.emit('[success] %s' % _("G-Code parsing in progress...")) self.app.inform.emit('[success] %s' % _("G-Code parsing in progress..."))
dia_cnc_dict['gcode_parsed'] = job_obj.gcode_parse() dia_cnc_dict['gcode_parsed'] = job_obj.gcode_parse()
self.app.inform.emit('[success] %s' % _("G-Code parsing finished...")) self.app.inform.emit('[success] %s' % _("G-Code parsing finished..."))

32
appTools/ToolDrilling.py
View File

@ -1725,12 +1725,13 @@ class ToolDrilling(AppTool, Excellon):
job_obj.options['Tools_in_use'] = tool_table_items job_obj.options['Tools_in_use'] = tool_table_items
# generate GCode # generate GCode
tool_gcode, __ = job_obj.excellon_tool_gcode_gen(used_tool, tool_points, self.excellon_tools, tool_gcode, __, start_gcode = job_obj.excellon_tool_gcode_gen(used_tool, tool_points,
first_pt=first_drill_point, self.excellon_tools,
is_first=True, first_pt=first_drill_point,
is_last=True, is_first=True,
opt_type=used_excellon_optimization_type, is_last=True,
toolchange=True) opt_type=used_excellon_optimization_type,
toolchange=True)
# parse the Gcode # parse the Gcode
tool_gcode_parsed = job_obj.excellon_tool_gcode_parse(used_tooldia, gcode=tool_gcode, tool_gcode_parsed = job_obj.excellon_tool_gcode_parse(used_tooldia, gcode=tool_gcode,
@ -1748,6 +1749,9 @@ class ToolDrilling(AppTool, Excellon):
if e_tool_dia != used_tooldia: if e_tool_dia != used_tooldia:
job_obj.exc_cnc_tools.pop(e_tool_dia, None) job_obj.exc_cnc_tools.pop(e_tool_dia, None)
if start_gcode != '':
job_obj.gc_start = start_gcode
self.total_gcode = tool_gcode self.total_gcode = tool_gcode
self.total_gcode_parsed = tool_gcode_parsed self.total_gcode_parsed = tool_gcode_parsed
@ -1778,12 +1782,13 @@ class ToolDrilling(AppTool, Excellon):
is_first_tool = True if tool == sel_tools[0] else False is_first_tool = True if tool == sel_tools[0] else False
# Generate Gcode for the current tool # Generate Gcode for the current tool
tool_gcode, last_pt = job_obj.excellon_tool_gcode_gen(tool, tool_points, self.excellon_tools, tool_gcode, last_pt, start_gcode = job_obj.excellon_tool_gcode_gen(
first_pt=first_drill_point, tool, tool_points, self.excellon_tools,
is_first=is_first_tool, first_pt=first_drill_point,
is_last=is_last_tool, is_first=is_first_tool,
opt_type=used_excellon_optimization_type, is_last=is_last_tool,
toolchange=True) opt_type=used_excellon_optimization_type,
toolchange=True)
# parse Gcode for the current tool # parse Gcode for the current tool
tool_gcode_parsed = job_obj.excellon_tool_gcode_parse(used_tooldia, gcode=tool_gcode, tool_gcode_parsed = job_obj.excellon_tool_gcode_parse(used_tooldia, gcode=tool_gcode,
@ -1794,6 +1799,9 @@ class ToolDrilling(AppTool, Excellon):
job_obj.exc_cnc_tools[used_tooldia]['gcode'] = tool_gcode job_obj.exc_cnc_tools[used_tooldia]['gcode'] = tool_gcode
job_obj.exc_cnc_tools[used_tooldia]['gcode_parsed'] = tool_gcode_parsed job_obj.exc_cnc_tools[used_tooldia]['gcode_parsed'] = tool_gcode_parsed
if start_gcode != '':
job_obj.gc_start = start_gcode
self.total_gcode += tool_gcode self.total_gcode += tool_gcode
self.total_gcode_parsed += tool_gcode_parsed self.total_gcode_parsed += tool_gcode_parsed

11
app_Main.py
View File

@ -2238,7 +2238,6 @@ class App(QtCore.QObject):
self.call_source = 'gcode_editor' self.call_source = 'gcode_editor'
self.gcode_editor.edit_fcgcode(edited_object) self.gcode_editor.edit_fcgcode(edited_object)
return
# make sure that we can't select another object while in Editor Mode: # make sure that we can't select another object while in Editor Mode:
# self.collection.view.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) # self.collection.view.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
@ -2379,7 +2378,12 @@ class App(QtCore.QObject):
# restore GUI to the Selected TAB # restore GUI to the Selected TAB
# Remove anything else in the GUI # Remove anything else in the GUI
self.ui.tool_scroll_area.takeWidget() self.ui.tool_scroll_area.takeWidget()
edited_obj.build_ui()
# close the open tab
for idx in range(self.ui.plot_tab_area.count()):
if self.ui.plot_tab_area.widget(idx).objectName() == 'gcode_editor_tab':
self.ui.plot_tab_area.closeTab(idx)
self.inform.emit('[success] %s' % _("Editor exited. Editor content saved.")) self.inform.emit('[success] %s' % _("Editor exited. Editor content saved."))
else: else:
@ -2413,6 +2417,11 @@ class App(QtCore.QObject):
edited_obj.build_ui() edited_obj.build_ui()
elif edited_obj.kind == 'cncjob': elif edited_obj.kind == 'cncjob':
edited_obj.build_ui() edited_obj.build_ui()
# close the open tab
for idx in range(self.ui.plot_tab_area.count()):
if self.ui.plot_tab_area.widget(idx).objectName() == 'gcode_editor_tab':
self.ui.plot_tab_area.closeTab(idx)
else: else:
self.inform.emit('[WARNING_NOTCL] %s' % self.inform.emit('[WARNING_NOTCL] %s' %
_("Select a Gerber, Geometry, Excellon or CNCJobObject to update.")) _("Select a Gerber, Geometry, Excellon or CNCJobObject to update."))

14
camlib.py
View File

@ -2980,7 +2980,8 @@ class CNCjob(Geometry):
:return: A tuple made from tool_gcode and another tuple holding the coordinates of the last point :return: A tuple made from tool_gcode, another tuple holding the coordinates of the last point
and the start gcode
:rtype: tuple :rtype: tuple
""" """
log.debug("Creating CNC Job from Excellon for tool: %s" % str(tool)) log.debug("Creating CNC Job from Excellon for tool: %s" % str(tool))
@ -3153,8 +3154,9 @@ class CNCjob(Geometry):
# graceful abort requested by the user # graceful abort requested by the user
raise grace raise grace
start_gcode = self.doformat(p.start_code) start_gcode = ''
if is_first: if is_first:
start_gcode = self.doformat(p.start_code)
t_gcode += start_gcode t_gcode += start_gcode
# do the ToolChange event # do the ToolChange event
@ -3305,7 +3307,7 @@ class CNCjob(Geometry):
t_gcode += self.doformat(p.end_code, x=0, y=0) t_gcode += self.doformat(p.end_code, x=0, y=0)
self.app.inform.emit(_("Finished G-Code generation for tool: %s" % str(tool))) self.app.inform.emit(_("Finished G-Code generation for tool: %s" % str(tool)))
return t_gcode, (locx, locy) return t_gcode, (locx, locy), start_gcode
def generate_from_excellon_by_tool(self, exobj, tools="all", order='fwd', use_ui=False): def generate_from_excellon_by_tool(self, exobj, tools="all", order='fwd', use_ui=False):
""" """
@ -5280,8 +5282,10 @@ class CNCjob(Geometry):
total_cut = 0.0 total_cut = 0.0
# Start GCode # Start GCode
start_gcode = ''
if is_first: if is_first:
t_gcode += self.doformat(p.start_code) start_gcode = self.doformat(p.start_code)
t_gcode += start_gcode
# Toolchange code # Toolchange code
t_gcode += self.doformat(p.feedrate_code) # sets the feed rate t_gcode += self.doformat(p.feedrate_code) # sets the feed rate
@ -5379,7 +5383,7 @@ class CNCjob(Geometry):
) )
self.gcode = t_gcode self.gcode = t_gcode
return self.gcode return self.gcode, start_gcode
def generate_from_geometry_2(self, geometry, append=True, tooldia=None, offset=0.0, tolerance=0, z_cut=None, def generate_from_geometry_2(self, geometry, append=True, tooldia=None, offset=0.0, tolerance=0, z_cut=None,
z_move=None, feedrate=None, feedrate_z=None, feedrate_rapid=None, spindlespeed=None, z_move=None, feedrate=None, feedrate_z=None, feedrate_rapid=None, spindlespeed=None,