From 54830ce2a3a1e80a70e2a74de94d8652f5b6b732 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Fri, 19 Sep 2014 23:37:24 +0200 Subject: [PATCH] GlyphDBEdit: display glyph texts in proper color. --- pixelocr/glyphdb.py | 5 +++++ pixelocr/gui/glyphdbedit.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pixelocr/glyphdb.py b/pixelocr/glyphdb.py index 82ac1b4..5ccf51b 100644 --- a/pixelocr/glyphdb.py +++ b/pixelocr/glyphdb.py @@ -43,6 +43,11 @@ class GlyphData(object): def color(self): return self.image.color + @property + def qcolor(self): + from PyQt4.QtGui import QColor + return QColor(*self.color) + @property def style(self): return Style(self.color, self.bold, self.italic) diff --git a/pixelocr/gui/glyphdbedit.py b/pixelocr/gui/glyphdbedit.py index abe6324..d01d108 100644 --- a/pixelocr/gui/glyphdbedit.py +++ b/pixelocr/gui/glyphdbedit.py @@ -71,6 +71,8 @@ class TextColumn(Column): if config.glyph_font_size: font.setPixelSize(config.glyph_font_size) return font + elif role == Qt.ForegroundRole: + return glyph_data.qcolor else: return super().data(glyph_data, role)