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

- removed the f-strings replacing them with the traditional string formatting due of not being supported by older versions of Python 3

Browse Source
This commit is contained in:
Marius Stanciu
2019-11-19 13:38:32 +02:00
parent 75273272e1
commit a4f5ed0b74
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
FlatCAMApp.py
View File

@@ -4708,8 +4708,7 @@ class App(QtCore.QObject):
e = sys.exc_info()[0] e = sys.exc_info()[0]
App.log.error("Could not load defaults file.") App.log.error("Could not load defaults file.")
App.log.error(str(e)) App.log.error(str(e))
self.inform.emit('[ERROR_NOTCL] %s' % self.inform.emit('[ERROR_NOTCL] %s' % _("Could not load defaults file."))
_("Could not load defaults file."))
return return
try: try:
@@ -4718,8 +4717,7 @@ class App(QtCore.QObject):
e = sys.exc_info()[0] e = sys.exc_info()[0]
App.log.error("Failed to parse defaults file.") App.log.error("Failed to parse defaults file.")
App.log.error(str(e)) App.log.error(str(e))
self.inform.emit('[ERROR_NOTCL] %s' % self.inform.emit('[ERROR_NOTCL] %s' % _("Failed to parse defaults file."))
_("Failed to parse defaults file."))
return return
# Update options # Update options
@@ -4766,11 +4764,11 @@ class App(QtCore.QObject):
f.close() f.close()
except Exception as e: except Exception as e:
log.debug("App.save_defaults() --> %s" % str(e)) log.debug("App.save_defaults() --> %s" % str(e))
self.inform.emit(f'[ERROR_NOTCL] {_("Failed to write defaults to file.")}') self.inform.emit('[ERROR_NOTCL] %s' % _("Failed to write defaults to file."))
return return
if not silent: if not silent:
self.inform.emit(f'[success] {_("Preferences saved.")}') self.inform.emit('[success] %s' % _("Preferences saved."))
def save_factory_defaults(self, silent_message=False, data_path=None): def save_factory_defaults(self, silent_message=False, data_path=None):
""" """
@@ -4798,7 +4796,7 @@ class App(QtCore.QObject):
e = sys.exc_info()[0] e = sys.exc_info()[0]
App.log.error("Could not load factory defaults file.") App.log.error("Could not load factory defaults file.")
App.log.error(str(e)) App.log.error(str(e))
self.inform.emit(f'[ERROR_NOTCL] {_("Could not load factory defaults file.")}') self.inform.emit('[ERROR_NOTCL] %s' % _("Could not load factory defaults file."))
return return
try: try:
@@ -4807,7 +4805,7 @@ class App(QtCore.QObject):
e = sys.exc_info()[0] e = sys.exc_info()[0]
App.log.error("Failed to parse factory defaults file.") App.log.error("Failed to parse factory defaults file.")
App.log.error(str(e)) App.log.error(str(e))
self.inform.emit(f'[ERROR_NOTCL] {_("Failed to parse factory defaults file.")}') self.inform.emit('[ERROR_NOTCL] %s' % _("Failed to parse factory defaults file."))
return return
# Update options # Update options
@@ -4821,12 +4819,12 @@ class App(QtCore.QObject):
json.dump(factory_defaults, f_f_def_s, default=to_dict, indent=2, sort_keys=True) json.dump(factory_defaults, f_f_def_s, default=to_dict, indent=2, sort_keys=True)
f_f_def_s.close() f_f_def_s.close()
except Exception as e: except Exception as e:
log.debug(f"App.save_factory_default() save update --> {str(e)}") log.debug("App.save_factory_default() save update --> %s" % str(e))
self.inform.emit(f'[ERROR_NOTCL] {_("Failed to write factory defaults to file.")}') self.inform.emit('[ERROR_NOTCL] %s' % _("Failed to write factory defaults to file."))
return return
if silent_message is False: if silent_message is False:
self.inform.emit(f'{_("Factory defaults saved.")}') self.inform.emit(_("Factory defaults saved."))
def final_save(self): def final_save(self):
""" """
@@ -4836,7 +4834,7 @@ class App(QtCore.QObject):
:return: None :return: None
""" """
if self.save_in_progress: if self.save_in_progress:
self.inform.emit(f'[WARNING_NOTCL] {_("Application is saving the project. Please wait ...")}') self.inform.emit('[WARNING_NOTCL] %s' % _("Application is saving the project. Please wait ..."))
return return
if self.should_we_save and self.collection.get_list(): if self.should_we_save and self.collection.get_list():

20
FlatCAMCommon.py
View File

@@ -257,7 +257,7 @@ class BookmarkManager(QtWidgets.QWidget):
else: else:
title = self.title_entry.get_value() title = self.title_entry.get_value()
if title == '': if title == '':
self.app.inform.emit(f'[ERROR_NOTCL] {_("Title entry is empty.")}') self.app.inform.emit('[ERROR_NOTCL] %s' % _("Title entry is empty."))
return 'fail' return 'fail'
if 'link' is kwargs: if 'link' is kwargs:
@@ -266,7 +266,7 @@ class BookmarkManager(QtWidgets.QWidget):
link = self.link_entry.get_value() link = self.link_entry.get_value()
if link == 'http://': if link == 'http://':
self.app.inform.emit(f'[ERROR_NOTCL] {_("Web link entry is empty.")}') self.app.inform.emit('[ERROR_NOTCL] %s' % _("Web link entry is empty."))
return 'fail' return 'fail'
# if 'http' not in link or 'https' not in link: # if 'http' not in link or 'https' not in link:
@@ -274,7 +274,7 @@ class BookmarkManager(QtWidgets.QWidget):
for bookmark in self.bm_dict.values(): for bookmark in self.bm_dict.values():
if title == bookmark[0] or link == bookmark[1]: if title == bookmark[0] or link == bookmark[1]:
self.app.inform.emit(f'[ERROR_NOTCL] {_("Either the Title or the Weblink already in the table.")}') self.app.inform.emit('[ERROR_NOTCL] %s' % _("Either the Title or the Weblink already in the table."))
return 'fail' return 'fail'
# for some reason if the last char in the weblink is a slash it does not make the link clickable # for some reason if the last char in the weblink is a slash it does not make the link clickable
@@ -294,7 +294,7 @@ class BookmarkManager(QtWidgets.QWidget):
act.triggered.connect(lambda: webbrowser.open(link)) act.triggered.connect(lambda: webbrowser.open(link))
self.app.ui.menuhelp_bookmarks.insertAction(self.app.ui.menuhelp_bookmarks_manager, act) self.app.ui.menuhelp_bookmarks.insertAction(self.app.ui.menuhelp_bookmarks_manager, act)
self.app.inform.emit(f'[success] {_("Bookmark added.")}') self.app.inform.emit('[success] %s' % _("Bookmark added."))
# add the new entry to the bookmark manager table # add the new entry to the bookmark manager table
self.build_bm_ui() self.build_bm_ui()
@@ -342,7 +342,7 @@ class BookmarkManager(QtWidgets.QWidget):
self.bm_dict = deepcopy(new_dict) self.bm_dict = deepcopy(new_dict)
new_dict.clear() new_dict.clear()
self.app.inform.emit(f'[success] {_("Bookmark removed.")}') self.app.inform.emit('[success] %s' % _("Bookmark removed."))
# for index in index_list: # for index in index_list:
# self.table_widget.model().removeRow(index.row()) # self.table_widget.model().removeRow(index.row())
@@ -990,7 +990,7 @@ class ToolsDB(QtWidgets.QWidget):
# add the new entry to the Tools DB table # add the new entry to the Tools DB table
self.build_db_ui() self.build_db_ui()
self.callback_on_edited() self.callback_on_edited()
self.app.inform.emit(f'[success] {_("Tool added to DB.")}') self.app.inform.emit('[success] %s' % _("Tool added to DB."))
def on_tool_copy(self): def on_tool_copy(self):
""" """
@@ -1011,7 +1011,7 @@ class ToolsDB(QtWidgets.QWidget):
self.build_db_ui() self.build_db_ui()
self.callback_on_edited() self.callback_on_edited()
self.app.inform.emit(f'[success] {_("Tool copied from Tools DB.")}') self.app.inform.emit('[success] %s' % _("Tool copied from Tools DB."))
def on_tool_delete(self): def on_tool_delete(self):
""" """
@@ -1029,7 +1029,7 @@ class ToolsDB(QtWidgets.QWidget):
self.build_db_ui() self.build_db_ui()
self.callback_on_edited() self.callback_on_edited()
self.app.inform.emit(f'[success] {_("Tool removed from Tools DB.")}') self.app.inform.emit('[success] %s' % _("Tool removed from Tools DB."))
def on_export_tools_db_file(self): def on_export_tools_db_file(self):
self.app.report_usage("on_export_tools_db_file") self.app.report_usage("on_export_tools_db_file")
@@ -1080,7 +1080,7 @@ class ToolsDB(QtWidgets.QWidget):
json.dump(self.db_tool_dict, f, default=to_dict, indent=2) json.dump(self.db_tool_dict, f, default=to_dict, indent=2)
except Exception as e: except Exception as e:
self.app.log.debug("App.on_save_tools_db() --> %s" % str(e)) self.app.log.debug("App.on_save_tools_db() --> %s" % str(e))
self.inform.emit(f'[ERROR_NOTCL] {_("Failed to write Tools DB to file.")}') self.inform.emit('[ERROR_NOTCL] %s' % _("Failed to write Tools DB to file."))
return return
except Exception: except Exception:
self.app.inform.emit('[ERROR_NOTCL] %s' % _("Failed to write Tools DB to file.")) self.app.inform.emit('[ERROR_NOTCL] %s' % _("Failed to write Tools DB to file."))
@@ -1135,7 +1135,7 @@ class ToolsDB(QtWidgets.QWidget):
f.close() f.close()
except Exception as e: except Exception as e:
self.app.log.debug("ToolsDB.on_save_tools_db() --> %s" % str(e)) self.app.log.debug("ToolsDB.on_save_tools_db() --> %s" % str(e))
self.app.inform.emit(f'[ERROR_NOTCL] {_("Failed to write Tools DB to file.")}') self.app.inform.emit('[ERROR_NOTCL] %s' % _("Failed to write Tools DB to file."))
return return
if not silent: if not silent:

4
README.md
View File

@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
19.11.2019
- removed the f-strings replacing them with the traditional string formatting due of not being supported by older versions of Python 3
18.11.2019 18.11.2019
- finished the Dots and Squares options in the Copper Thieving Tool - finished the Dots and Squares options in the Copper Thieving Tool