Skip to content

Commit 375e591

Browse files
committed
Report.report_table: handle QColor as BackgroundRole
1 parent 7ef8aaa commit 375e591

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Orange/canvas/report/report.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from collections import OrderedDict, Iterable
44
from itertools import chain
55
from PyQt4.QtCore import Qt, QAbstractItemModel, QByteArray, QBuffer, QIODevice, QLocale
6-
from PyQt4.QtGui import QGraphicsScene, QTableView, QColor
6+
from PyQt4.QtGui import QGraphicsScene, QTableView, QColor, QBrush
77

88
from Orange.util import try_
99
from Orange.widgets.io import PngFormat
@@ -222,10 +222,12 @@ def data(role=Qt.DisplayRole,
222222
if view and row is not None and col is not None else False)
223223

224224
fgcolor = data(Qt.ForegroundRole)
225-
fgcolor = fgcolor.color().name() if fgcolor else 'black'
225+
fgcolor = (QBrush(fgcolor).color().name()
226+
if isinstance(fgcolor, (QBrush, QColor)) else 'black')
226227

227228
bgcolor = data(Qt.BackgroundRole)
228-
bgcolor = bgcolor.color().name() if bgcolor else 'transparent'
229+
bgcolor = (QBrush(bgcolor).color().name()
230+
if isinstance(bgcolor, (QBrush, QColor)) else 'transparent')
229231
if bgcolor.lower() == '#ffffff':
230232
bgcolor = 'transparent'
231233

0 commit comments

Comments
 (0)