- made sure that the units are read from the self.defaults and not from the GUI

- added Robber Bar option to Copper Thieving Tool
This commit is contained in:
Marius Stanciu
2019-11-24 00:31:41 +02:00
committed by Marius
parent 8c4663f344
commit d03428f860
26 changed files with 279 additions and 90 deletions

View File

@@ -617,7 +617,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.app.ui.notebook.setTabText(2, _("NCC Tool"))
def set_tool_ui(self):
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
self.units = self.app.defaults['units'].upper()
if self.units == "IN":
self.decimals = 4
@@ -715,13 +715,13 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.bound_obj = None
self.tool_type_item_options = ["C1", "C2", "C3", "C4", "B", "V"]
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
self.units = self.app.defaults['units'].upper()
def build_ui(self):
self.ui_disconnect()
# updated units
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
self.units = self.app.defaults['units'].upper()
sorted_tools = []
for k, v in self.ncc_tools.items():
@@ -954,7 +954,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
def on_tool_add(self, dia=None, muted=None):
self.ui_disconnect()
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
self.units = self.app.defaults['units'].upper()
if dia:
tool_dia = dia
@@ -1404,7 +1404,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
# ####### Read the parameters #########################################
# #####################################################################
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value()
units = self.app.defaults['units']
log.debug("NCC Tool started. Reading parameters.")
self.app.inform.emit(_("NCC Tool started. Reading parameters."))