diff options
| author | Marc L <marcll@vt.edu> | 2017-08-27 09:54:23 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-27 09:59:06 -0700 |
| commit | 00c4fdb0017d9c54c94338a4a3fb49cf00d707ac (patch) | |
| tree | 37ba59ecb0309c3b53d97ba99ba07711fa972aa1 /gr-qtgui/lib/TimeDomainDisplayPlot.cc | |
| parent | 7162a7ed65a0d03cb147cbe95f2a47fe68f87ab8 (diff) | |
qtgui: raised time sink inputs to 12/24 and added GRC check for 5/10
This commit raises the number of inputs to gr::qtgui:time_sink_c and f
to 12 and 24, respectively. However, the GRC XML wrapper for the block
has a hard-coded limit of 5/10; so a check was added to ensure the
input field in GRC is restricted to this amount. The future fix should
be to rewrite the XML (or YAML in 3.8) to operate as a for loop.
Diffstat (limited to 'gr-qtgui/lib/TimeDomainDisplayPlot.cc')
| -rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 51a1989a9a..e1e8482369 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -170,8 +170,14 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent) colors << QColor(Qt::blue) << QColor(Qt::red) << QColor(Qt::green) << QColor(Qt::black) << QColor(Qt::cyan) << QColor(Qt::magenta) << QColor(Qt::yellow) << QColor(Qt::gray) << QColor(Qt::darkRed) + << QColor(Qt::darkGreen) << QColor(Qt::darkBlue) << QColor(Qt::darkGray) + // cycle through all colors again to increase time_sink_f input limit + // from 12 to 24, otherwise you get a segfault + << QColor(Qt::blue) << QColor(Qt::red) << QColor(Qt::green) + << QColor(Qt::black) << QColor(Qt::cyan) << QColor(Qt::magenta) + << QColor(Qt::yellow) << QColor(Qt::gray) << QColor(Qt::darkRed) << QColor(Qt::darkGreen) << QColor(Qt::darkBlue) << QColor(Qt::darkGray); - + // Setup dataPoints and plot vectors // Automatically deleted when parent is deleted for(int i = 0; i < d_nplots; i++) { |