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

Fix some things that I broke and further cleanup

Browse Source
This commit is contained in:
David Robertson
2020-04-29 02:46:52 +01:00
parent 72c2dd5f26
commit a05c174ec8
41 changed files with 314 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatcamObjects/FlatCAMCNCJob.py
View File

@@ -487,7 +487,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
:param args:
:return:
"""
self.app.report_usage("cncjob_on_exportgcode_button")
self.app.defaults.report_usage("cncjob_on_exportgcode_button")
self.read_form()
name = self.app.collection.get_active().options['name']

6
flatcamObjects/FlatCAMExcellon.py
View File

@@ -1234,13 +1234,13 @@ class ExcellonObject(FlatCAMObj, Excellon):
return True, ""
def on_generate_milling_button_click(self, *args):
self.app.report_usage("excellon_on_create_milling_drills button")
self.app.defaults.report_usage("excellon_on_create_milling_drills button")
self.read_form()
self.generate_milling_drills(use_thread=False)
def on_generate_milling_slots_button_click(self, *args):
self.app.report_usage("excellon_on_create_milling_slots_button")
self.app.defaults.report_usage("excellon_on_create_milling_slots_button")
self.read_form()
self.generate_milling_slots(use_thread=False)
@@ -1338,7 +1338,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
pass
def on_create_cncjob_button_click(self, *args):
self.app.report_usage("excellon_on_create_cncjob_button")
self.app.defaults.report_usage("excellon_on_create_cncjob_button")
self.read_form()
# Get the tools from the list

2
flatcamObjects/FlatCAMGeometry.py
View File

@@ -1575,7 +1575,7 @@ class GeometryObject(FlatCAMObj, Geometry):
def on_generatecnc_button_click(self, *args):
log.debug("Generating CNCJob from Geometry ...")
self.app.report_usage("geometry_on_generatecnc_button")
self.app.defaults.report_usage("geometry_on_generatecnc_button")
# this reads the values in the UI form to the self.options dictionary
self.read_form()

6
flatcamObjects/FlatCAMGerber.py
View File

@@ -505,7 +505,7 @@ class GerberObject(FlatCAMObj, Gerber):
self.app.worker_task.emit({'fcn': buffer_task, 'params': []})
def on_generatenoncopper_button_click(self, *args):
self.app.report_usage("gerber_on_generatenoncopper_button")
self.app.defaults.report_usage("gerber_on_generatenoncopper_button")
self.read_form()
name = self.options["name"] + "_noncopper"
@@ -532,7 +532,7 @@ class GerberObject(FlatCAMObj, Gerber):
self.app.new_object("geometry", name, geo_init)
def on_generatebb_button_click(self, *args):
self.app.report_usage("gerber_on_generatebb_button")
self.app.defaults.report_usage("gerber_on_generatebb_button")
self.read_form()
name = self.options["name"] + "_bbox"
@@ -574,7 +574,7 @@ class GerberObject(FlatCAMObj, Gerber):
# in the end toggle the visibility of the origin object so we can see the generated Geometry
iso_obj.ui.plot_cb.toggle()
else:
app_obj.report_usage("gerber_on_iso_button")
app_obj.defaults.report_usage("gerber_on_iso_button")
self.read_form()
iso_scope = 'all' if self.ui.iso_scope_radio.get_value() == 'all' else 'single'

4
flatcamObjects/FlatCAMObj.py
View File

@@ -236,7 +236,7 @@ class FlatCAMObj(QtCore.QObject):
)
def on_offset_button_click(self):
self.app.report_usage("obj_on_offset_button")
self.app.defaults.report_usage("obj_on_offset_button")
self.read_form()
vector_val = self.ui.offsetvector_entry.get_value()
@@ -283,7 +283,7 @@ class FlatCAMObj(QtCore.QObject):
self.app.worker_task.emit({'fcn': worker_task, 'params': []})
def on_skew_button_click(self):
self.app.report_usage("obj_on_skew_button")
self.app.defaults.report_usage("obj_on_skew_button")
self.read_form()
x_angle = self.ui.xangle_entry.get_value()
y_angle = self.ui.yangle_entry.get_value()