From b458b79bed5dadc578a178ededd5ff5fd4705e9a Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 13 Oct 2015 23:04:35 +0200 Subject: [PATCH] [Horus] make clean also cleans the font bitmap files --- radio/src/Makefile | 1 + radio/util/font2png.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/radio/src/Makefile b/radio/src/Makefile index ebeb7224a..71eef86cd 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -2087,6 +2087,7 @@ clean_list : $(REMOVE) bitmaps/*/*.lbm $(REMOVE) bitmaps/*/*/*.lbm $(REMOVE) fonts/*.lbm + $(REMOVE) fonts/font_* $(REMOVE) fonts/*/*.lbm $(REMOVE) lua_exports* lua_fields.txt $(MAKE) -C targets/taranis/bootloader clean diff --git a/radio/util/font2png.py b/radio/util/font2png.py index 86a6ce8bb..73acb86e6 100755 --- a/radio/util/font2png.py +++ b/radio/util/font2png.py @@ -11,7 +11,7 @@ except: pass for f in glob.glob("fonts/*.ttf"): - id = QtGui.QFontDatabase.addApplicationFont(f) + QtGui.QFontDatabase.addApplicationFont(f) chars = u""" !"#$%&'()*+,-./0123456789:;<=>?°ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz~ ≥→←↑↓ △Ⓘ""" @@ -40,14 +40,12 @@ def getFontWidth(fontsize, metrics): def createFontBitmap(filename, fontname, fontsize, foreground, background, coordsfile=True): coords = [ ] - # font = QtGui.QFont(QtGui.QFontDatabase.applicationFontFamilies(id)[0]) font = QtGui.QFont(fontname) font.setPixelSize(fontsize) font.setHintingPreference(QtGui.QFont.PreferNoHinting) metrics = QtGui.QFontMetrics(font) width = getFontWidth(fontsize, metrics) top, bottom = getFontTopBottom(fontsize, metrics) - print top, bottom image = QtGui.QImage(width, fontsize+1, QtGui.QImage.Format_RGB32) image.fill(background) painter = QtGui.QPainter()