giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed the parsing of the Manufacturing files when double clicking them and they are registered with FlatCAM 

- fixed showing the GUI when some settings (maximized_GUI) are missing from QSettings
This commit is contained in:
Marius Stanciu 2019-09-18 02:33:17 +03:00 committed by Marius
parent 8958ef8007
commit f432b065fa
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FlatCAMApp.py
View File

@ -2439,6 +2439,8 @@ class App(QtCore.QObject):
self.ui.showMaximized() self.ui.showMaximized()
else: else:
self.ui.show() self.ui.show()
else:
self.ui.show()
# ##################################################################################### # #####################################################################################
# ########################## START-UP ARGUMENTS ####################################### # ########################## START-UP ARGUMENTS #######################################
@ -2580,6 +2582,7 @@ class App(QtCore.QObject):
proc_arg = argument.lower() proc_arg = argument.lower()
for ext in exc_list: for ext in exc_list:
proc_ext = ext.replace(' ', '') proc_ext = ext.replace(' ', '')
proc_ext = '.%s' % proc_ext
if proc_ext.lower() in proc_arg and proc_ext != '': if proc_ext.lower() in proc_arg and proc_ext != '':
file_name = str(argument) file_name = str(argument)
if file_name == "": if file_name == "":
@ -2591,7 +2594,9 @@ class App(QtCore.QObject):
gco_list = self.ui.fa_defaults_form.fa_gcode_group.gco_list_text.get_value().split(',') gco_list = self.ui.fa_defaults_form.fa_gcode_group.gco_list_text.get_value().split(',')
for ext in gco_list: for ext in gco_list:
proc_ext = ext.replace(' ', '') proc_ext = ext.replace(' ', '')
proc_ext = '.%s' % proc_ext
if proc_ext.lower() in proc_arg and proc_ext != '': if proc_ext.lower() in proc_arg and proc_ext != '':
print(proc_ext, proc_arg)
file_name = str(argument) file_name = str(argument)
if file_name == "": if file_name == "":
self.inform.emit(_("Open GCode file failed.")) self.inform.emit(_("Open GCode file failed."))
@ -2602,6 +2607,7 @@ class App(QtCore.QObject):
grb_list = self.ui.fa_defaults_form.fa_gerber_group.grb_list_text.get_value().split(',') grb_list = self.ui.fa_defaults_form.fa_gerber_group.grb_list_text.get_value().split(',')
for ext in grb_list: for ext in grb_list:
proc_ext = ext.replace(' ', '') proc_ext = ext.replace(' ', '')
proc_ext = '.%s' % proc_ext
if proc_ext.lower() in proc_arg and proc_ext != '': if proc_ext.lower() in proc_arg and proc_ext != '':
file_name = str(argument) file_name = str(argument)
if file_name == "": if file_name == "":

4
README.md
View File

@ -11,7 +11,9 @@ CAD program, and create G-Code for Isolation routing.
18.09.2019 18.09.2019
- added more funtionality to the Extension registration with FLatCAM and added to the GUI in Edit -> Preferences -> Utilities - added more functionality to the Extension registration with FLatCAM and added to the GUI in Edit -> Preferences -> Utilities
- fixed the parsing of the Manufacturing files when double clicking them and they are registered with FlatCAM
- fixed showing the GUI when some settings (maximized_GUI) are missing from QSettings
17.09.2019 17.09.2019