[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 06/08: qtgui: fixed stray variable; also pr
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 06/08: qtgui: fixed stray variable; also problem between qwt 6.0 and 6.1. |
Date: |
Mon, 6 Apr 2015 06:03:45 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit e2c132f7287656289ed9d1c615005f70f96a46d4
Author: Tom Rondeau <address@hidden>
Date: Sun Apr 5 22:44:56 2015 -0400
qtgui: fixed stray variable; also problem between qwt 6.0 and 6.1.
---
gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | 2 --
gr-qtgui/lib/FrequencyDisplayPlot.cc | 1 -
2 files changed, 3 deletions(-)
diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
index 3d7b29b..9edff7b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
@@ -298,8 +298,6 @@ protected:
QList<QColor> d_trace_colors;
bool d_autoscale_state;
-
- QwtLegend d_legend;
};
#endif /* DOMAIN_DISPLAY_PLOT_H */
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc
b/gr-qtgui/lib/FrequencyDisplayPlot.cc
index f70e8a1..f5e02ac 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.cc
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc
@@ -216,7 +216,6 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots,
QWidget* parent)
// Turn off min/max hold plots in legend
#if QWT_VERSION < 0x060100
QWidget *w;
- d_legend = legend();
w = legend()->find(d_min_fft_plot_curve);
((QwtLegendItem*)w)->setChecked(true);
w = legend()->find(d_max_fft_plot_curve);
- [Commit-gnuradio] [gnuradio] branch master updated (cce2347 -> 93c25bc), git, 2015/04/06
- [Commit-gnuradio] [gnuradio] 04/08: qtgui: fixed an issue setting up control panel at runtime., git, 2015/04/06
- [Commit-gnuradio] [gnuradio] 06/08: qtgui: fixed stray variable; also problem between qwt 6.0 and 6.1.,
git <=
- [Commit-gnuradio] [gnuradio] 07/08: qtgui: added stop button to freq control panel., git, 2015/04/06
- [Commit-gnuradio] [gnuradio] 02/08: qtgui: toggle legend off in GRC properties., git, 2015/04/06
- [Commit-gnuradio] [gnuradio] 05/08: qtgui: enable/disable waterfall legend., git, 2015/04/06
- [Commit-gnuradio] [gnuradio] 03/08: qtgui: added trigger line and controlpanel settings., git, 2015/04/06
- [Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'tom/qtgui/freq_control_panel', git, 2015/04/06
- [Commit-gnuradio] [gnuradio] 01/08: qtgui: adds control panel to frequency sinks., git, 2015/04/06