[Horus] make clean also cleans the font bitmap files

This commit is contained in:
Bertrand Songis
2015-10-14 23:47:52 +02:00
parent b3979d9fff
commit b458b79bed
2 changed files with 2 additions and 3 deletions
+1
View File
@@ -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
+1 -3
View File
@@ -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()