Просмотр исходного кода

- added a status message for font parsing

Marius Stanciu 7 лет назад
Родитель
Сommit
18de843fc1
3 измененных файлов с 10 добавлено и 3 удалено
  1. 1 1
      FlatCAMApp.py
  2. 5 2
      ParseFont.py
  3. 4 0
      README.md

+ 1 - 1
FlatCAMApp.py

@@ -1128,7 +1128,7 @@ class App(QtCore.QObject):
         self.install_tools()
 
         ### System Font Parsing ###
-        self.f_parse = ParseFont()
+        self.f_parse = ParseFont(self)
         self.parse_system_fonts()
 
         # test if the program was started with a script as parameter

+ 5 - 2
ParseFont.py

@@ -182,9 +182,11 @@ class ParseFont():
                 break
         return name, family
 
-    def __init__(self, parent=None):
+    def __init__(self, app, parent=None):
         super(ParseFont, self).__init__()
 
+        self.app = app
+
         # regular fonts
         self.regular_f = {}
         # bold fonts
@@ -281,8 +283,9 @@ class ParseFont():
             elif font_type == 'regular':
                 path_filename = regular_dict[font_name]
         except Exception as e:
+            self.app.inform.emit("[error_notcl] Font not supported, try another one.")
             log.debug("[error_notcl] Font Loading: %s" % str(e))
-            return"[ERROR] Font Loading: %s" % str(e)
+            return "flatcam font parse failed"
 
         face = ft.Face(path_filename)
         face.set_char_size(int(font_size) * 64)

+ 4 - 0
README.md

@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+11.01.2019
+
+- added a status message for font parsing
+
 9.01.2019
 
 - added a fix to allow creating of Excellon geometry even when there are points with no tools by skipping those points and warning the user about this in a Tcl message