bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixing an issue with not building the UI for the generated objects when running a script and then trying to enable/disable the plots

Browse Source 
- attempting to add a feature in the text editors to autoselect all words in a document that are the same as the one that was clicked
- all the colors set in Preferences now have to be in the 8digits format RGBA (including the alpha channel as a suffix) - it is required to delete the current preferences files
This commit is contained in:
Marius Stanciu
2022-01-17 21:26:10 +02:00
committed by Marius
parent fd696b00a2
commit 2430158334
11 changed files with 117 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
appObjects/FlatCAMCNCJob.py
View File

@@ -1219,12 +1219,16 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.ui_disconnect()
cb_flag = self.ui.plot_cb.isChecked()
for row in range(self.ui.cnc_tools_table.rowCount()):
table_cb = self.ui.cnc_tools_table.cellWidget(row, 6)
if cb_flag:
table_cb.setChecked(True)
else:
table_cb.setChecked(False)
try:
for row in range(self.ui.cnc_tools_table.rowCount()):
table_cb = self.ui.cnc_tools_table.cellWidget(row, 6)
if cb_flag:
table_cb.setChecked(True)
else:
table_cb.setChecked(False)
except AttributeError:
# TODO from Tcl commands - should fix it sometime
pass
self.ui_connect()
def on_plot_cb_click_table(self):
@@ -1307,13 +1311,14 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# we may have a tuple with only one element and a comma
dia_plot = [float(el) for el in self.options["tooldia"].split(',') if el != ''][0]
else:
try:
dia_plot = float(self.options["tools_mill_tooldia"])
except ValueError:
# we may have a tuple with only one element and a comma
dia_plot = [
float(el) for el in self.options["tools_mill_tooldia"].split(',') if el != ''
][0]
# try:
# dia_plot = float(self.options["tools_mill_tooldia"])
# except ValueError:
# # we may have a tuple with only one element and a comma
# dia_plot = [
# float(el) for el in self.options["tools_mill_tooldia"].split(',') if el != ''
# ][0]
dia_plot = float(self.options["cncjob_tooldia"])
self.plot2(tooldia=dia_plot, obj=self, visible=visible, kind=kind)
else: