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

- fixed some issues with not finding the methods when treating the startup arguments

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-07 09:03:19 +02:00
committed by Marius
parent f04d8be50f
commit 24acb71874
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -9,6 +9,10 @@ CHANGELOG for FlatCAM beta
7.11.2020 7.11.2020
- fixed some issues with not finding the methods when treating the startup arguments
7.11.2020
- fixed a small issue in Excellon Editor that reset the delta coordinates on right mouse button click too, which was incorrect. Only left mouse button click should reset the delta coordinates. - fixed a small issue in Excellon Editor that reset the delta coordinates on right mouse button click too, which was incorrect. Only left mouse button click should reset the delta coordinates.
- In Gerber Editor upgraded the UI - In Gerber Editor upgraded the UI
- in Gerber Editor made sure that trying to add a Circular Pad array with null radius will fail - in Gerber Editor made sure that trying to add a Circular Pad array with null radius will fail

0
appCommon/__init__.py Normal file
View File

14
app_Main.py
View File

@@ -1788,7 +1788,7 @@ class App(QtCore.QObject):
run_from_arg = True run_from_arg = True
# self.worker_task.emit({'fcn': self.open_project, # self.worker_task.emit({'fcn': self.open_project,
# 'params': [project_name, run_from_arg]}) # 'params': [project_name, run_from_arg]})
self.open_project(filename=project_name, run_from_arg=run_from_arg) self.f_handlers.open_project(filename=project_name, run_from_arg=run_from_arg)
except Exception as e: except Exception as e:
self.log.debug("Could not open FlatCAM project file as App parameter due: %s" % str(e)) self.log.debug("Could not open FlatCAM project file as App parameter due: %s" % str(e))
@@ -1803,7 +1803,7 @@ class App(QtCore.QObject):
run_from_arg = True run_from_arg = True
# self.worker_task.emit({'fcn': self.open_config_file, # self.worker_task.emit({'fcn': self.open_config_file,
# 'params': [file_name, run_from_arg]}) # 'params': [file_name, run_from_arg]})
self.open_config_file(file_name, run_from_arg=run_from_arg) self.f_handlers.open_config_file(file_name, run_from_arg=run_from_arg)
except Exception as e: except Exception as e:
self.log.debug("Could not open FlatCAM Config file as App parameter due: %s" % str(e)) self.log.debug("Could not open FlatCAM Config file as App parameter due: %s" % str(e))
@@ -1816,9 +1816,9 @@ class App(QtCore.QObject):
self.inform.emit(_("Open Script file failed.")) self.inform.emit(_("Open Script file failed."))
else: else:
if silent is False: if silent is False:
self.on_fileopenscript(name=file_name) self.f_handlers.on_fileopenscript(name=file_name)
self.ui.plot_tab_area.setCurrentWidget(self.ui.plot_tab) self.ui.plot_tab_area.setCurrentWidget(self.ui.plot_tab)
self.on_filerunscript(name=file_name) self.f_handlers.on_filerunscript(name=file_name)
except Exception as e: except Exception as e:
self.log.debug("Could not open FlatCAM Script file as App parameter due: %s" % str(e)) self.log.debug("Could not open FlatCAM Script file as App parameter due: %s" % str(e))
@@ -1841,7 +1841,7 @@ class App(QtCore.QObject):
if silent is False: if silent is False:
self.inform.emit(_("Open Excellon file failed.")) self.inform.emit(_("Open Excellon file failed."))
else: else:
self.on_fileopenexcellon(name=file_name, signal=None) self.f_handlers.on_fileopenexcellon(name=file_name, signal=None)
return return
gco_list = self.ui.util_defaults_form.fa_gcode_group.gco_list_text.get_value().split(',') gco_list = self.ui.util_defaults_form.fa_gcode_group.gco_list_text.get_value().split(',')
@@ -1854,7 +1854,7 @@ class App(QtCore.QObject):
if silent is False: if silent is False:
self.inform.emit(_("Open GCode file failed.")) self.inform.emit(_("Open GCode file failed."))
else: else:
self.on_fileopengcode(name=file_name, signal=None) self.f_handlers.on_fileopengcode(name=file_name, signal=None)
return return
grb_list = self.ui.util_defaults_form.fa_gerber_group.grb_list_text.get_value().split(',') grb_list = self.ui.util_defaults_form.fa_gerber_group.grb_list_text.get_value().split(',')
@@ -1867,7 +1867,7 @@ class App(QtCore.QObject):
if silent is False: if silent is False:
self.inform.emit(_("Open Gerber file failed.")) self.inform.emit(_("Open Gerber file failed."))
else: else:
self.on_fileopengerber(name=file_name, signal=None) self.f_handlers.on_fileopengerber(name=file_name, signal=None)
return return
# if it reached here without already returning then the app was registered with a file that it does not # if it reached here without already returning then the app was registered with a file that it does not