- fixed issue with not updating correctly the plot kind (all, cut, travel) when clicking in the CNC Tools Table plot buttons
- made the GCode Editor for ToolSolderPaste clear the text before updating the Code Editor tab - all the Tabs in Plot Area are closed (except Plot Area itself) on New Project creation
This commit is contained in:
parent
c7a2b69637
commit
45b5cba68a
|
@ -4829,6 +4829,16 @@ class App(QtCore.QObject):
|
|||
# Init Tools
|
||||
self.init_tools()
|
||||
|
||||
# Close any Tabs opened in the Plot Tab Area section
|
||||
for index in range(self.ui.plot_tab_area.count()):
|
||||
self.ui.plot_tab_area.closeTab(index)
|
||||
# for whatever reason previous command does not close the last tab so I do it manually
|
||||
self.ui.plot_tab_area.closeTab(0)
|
||||
|
||||
# # And then add again the Plot Area
|
||||
self.ui.plot_tab_area.addTab(self.ui.plot_tab, "Plot Area")
|
||||
self.ui.plot_tab_area.protectTab(0)
|
||||
|
||||
# take the focus of the Notebook on Project Tab.
|
||||
self.ui.notebook.setCurrentWidget(self.ui.project_tab)
|
||||
|
||||
|
|
|
@ -5199,6 +5199,8 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
|
|||
cw_index = self.ui.cnc_tools_table.indexAt(cw.pos())
|
||||
cw_row = cw_index.row()
|
||||
|
||||
kind = self.ui.cncplot_method_combo.get_value()
|
||||
|
||||
self.shapes.clear(update=True)
|
||||
|
||||
for tooluid_key in self.cnc_tools:
|
||||
|
@ -5209,7 +5211,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
|
|||
for r in range(self.ui.cnc_tools_table.rowCount()):
|
||||
if int(self.ui.cnc_tools_table.item(r, 5).text()) == int(tooluid_key):
|
||||
if self.ui.cnc_tools_table.cellWidget(r, 6).isChecked():
|
||||
self.plot2(tooldia=tooldia, obj=self, visible=True, gcode_parsed=gcode_parsed)
|
||||
self.plot2(tooldia=tooldia, obj=self, visible=True, gcode_parsed=gcode_parsed, kind=kind)
|
||||
|
||||
self.shapes.redraw()
|
||||
|
||||
|
|
|
@ -20,6 +20,9 @@ CAD program, and create G-Code for Isolation routing.
|
|||
- ToolSolderPaste tools (nozzles) now have each it's own settings
|
||||
- creating the camlib functions for the ToolSolderPaste gcode generation functions
|
||||
- finished work in ToolSolderPaste
|
||||
- fixed issue with not updating correctly the plot kind (all, cut, travel) when clicking in the CNC Tools Table plot buttons
|
||||
- made the GCode Editor for ToolSolderPaste clear the text before updating the Code Editor tab
|
||||
- all the Tabs in Plot Area are closed (except Plot Area itself) on New Project creation
|
||||
|
||||
20.02.2019
|
||||
|
||||
|
|
|
@ -954,6 +954,9 @@ class SolderPaste(FlatCAMTool):
|
|||
# add the tab if it was closed
|
||||
self.app.ui.plot_tab_area.addTab(self.app.ui.cncjob_tab, "Code Editor")
|
||||
|
||||
# first clear previous text in text editor (if any)
|
||||
self.app.ui.code_editor.clear()
|
||||
|
||||
# Switch plot_area to CNCJob tab
|
||||
self.app.ui.plot_tab_area.setCurrentWidget(self.app.ui.cncjob_tab)
|
||||
|
||||
|
|
Loading…
Reference in New Issue