diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-27 10:30:34 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-27 10:30:34 -0700 |
| commit | bb10a47f37ad0d0fbe9ed4494595de384168a414 (patch) | |
| tree | 00696dcd011297e65d6d1c51f64a3402946e9042 /gr-qtgui/lib/TimeDomainDisplayPlot.cc | |
| parent | afd7c8e43659ec461ae4c4859ecf55ba95304255 (diff) | |
| parent | 1c0d7cd79b245b85b516496916a55695452e34ff (diff) | |
Merge branch 'next' into python3
Conflicts:
gr-uhd/grc/gen_uhd_usrp_blocks.py
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++) { |