diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-12 21:55:23 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-12 21:55:23 -0500 |
| commit | bbbbf8b042c3443415ae766bf7b6a26134c0119d (patch) | |
| tree | a604bad094914ec9cb6d76ce189986befa5e6547 /gr-qtgui/lib/displayform.cc | |
| parent | ea539a77938c81bb046a6d83f3cf3f40eaa33c49 (diff) | |
| parent | 8740eb0d9460060ae97f9d252cae81cdcf0e20e5 (diff) | |
Merge branch 'qtgui_stylesheets' into next
Conflicts:
gr-qtgui/lib/DisplayPlot.cc
gr-qtgui/lib/DisplayPlot.h
gr-qtgui/lib/displayform.cc
Fixed some function name issues and updated qtgui examples.
Diffstat (limited to 'gr-qtgui/lib/displayform.cc')
| -rw-r--r-- | gr-qtgui/lib/displayform.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc index 4daf5c76ef..e2475cb95e 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -207,7 +207,8 @@ DisplayForm::setLineLabel(int which, const QString &label) void DisplayForm::setLineColor(int which, const QString &color) { - _displayPlot->setLineColor(which, color); + QColor c = QColor(color); + _displayPlot->setLineColor(which, c); _displayPlot->replot(); } |