- fixed an issue that caused the impossibility to load a GCode file that contained the % symbol even when was loaded in a regular way from the File menu

- re-added the CNC tool diameter entry for the CNCjob object in Selected tab.FCSpinner
- since the CNCjob geometry creation is only useful for graphical purposes and have no impact on the GCode creation I have removed the cascaded union on the GCode geometry therefore speeding up the Gcode display by many factors (perhaps hundreds of times faster)
This commit is contained in:
Marius Stanciu
2019-10-14 22:26:50 +03:00
committed by Marius
parent 5580c49a92
commit d43ec01cdd
5 changed files with 51 additions and 36 deletions

View File

@@ -5872,7 +5872,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
self.form_fields.update({
"plot": self.ui.plot_cb,
# "tooldia": self.ui.tooldia_entry,
"tooldia": self.ui.tooldia_entry,
"append": self.ui.append_text,
"prepend": self.ui.prepend_text,
"toolchange_macro": self.ui.toolchange_text,
@@ -5907,6 +5907,13 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
except AttributeError:
pass
if self.multitool is False:
self.ui.tooldia_entry.show()
self.ui.updateplot_button.show()
else:
self.ui.tooldia_entry.hide()
self.ui.updateplot_button.hide()
# set the kind of geometries are plotted by default with plot2() from camlib.CNCJob
self.ui.cncplot_method_combo.set_value(self.app.defaults["cncjob_plot_kind"])
@@ -5965,7 +5972,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
and plots the object.
"""
self.read_form()
self.plot()
self.on_plot_kind_change()
def on_plot_kind_change(self):
kind = self.ui.cncplot_method_combo.get_value()