[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/08: qtgui: added stop button to freq con
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 07/08: qtgui: added stop button to freq control panel. |
Date: |
Mon, 6 Apr 2015 06:03:46 +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 93e4bfb83e0a05b044cfad8c2a41dd7b3cc8728a
Author: Tom Rondeau <address@hidden>
Date: Sun Apr 5 22:45:25 2015 -0400
qtgui: added stop button to freq control panel.
---
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 4 ++++
gr-qtgui/lib/freqcontrolpanel.cc | 15 +++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
index b2d90cc..b7036d4 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
@@ -98,6 +98,10 @@ private:
QLabel *d_trigger_level_label;
QComboBox *d_trigger_mode_combo;
QPushButton *d_trigger_level_plus, *d_trigger_level_minus;
+
+ QGroupBox *d_extras_box;
+ QVBoxLayout *d_extras_layout;
+ QPushButton *d_stop_button;
};
#endif /* FREQ_CONTROL_PANEL_H */
diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc
index fa3e924..da68f72 100644
--- a/gr-qtgui/lib/freqcontrolpanel.cc
+++ b/gr-qtgui/lib/freqcontrolpanel.cc
@@ -119,6 +119,12 @@ FreqControlPanel::FreqControlPanel(FreqDisplayForm *form)
d_trigger_level_layout->addWidget(d_trigger_level_minus);
+ // Set up the box for other items
+ d_extras_box = new QGroupBox("Extras");
+ d_extras_layout = new QVBoxLayout;
+ d_stop_button = new QPushButton("Stop");
+ d_stop_button->setCheckable(true);
+
// Set up the boxes into the layout
d_trace_layout->addWidget(d_maxhold_check);
d_trace_layout->addWidget(d_minhold_check);
@@ -139,10 +145,14 @@ FreqControlPanel::FreqControlPanel(FreqDisplayForm *form)
d_trigger_layout->addLayout(d_trigger_level_layout);
d_trigger_box->setLayout(d_trigger_layout);
+ d_extras_layout->addWidget(d_stop_button);
+ d_extras_box->setLayout(d_extras_layout);
+
addWidget(d_trace_box);
addWidget(d_axes_box);
addWidget(d_fft_box);
addWidget(d_trigger_box);
+ addWidget(d_extras_box);
addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum,
QSizePolicy::Expanding));
@@ -183,6 +193,9 @@ FreqControlPanel::FreqControlPanel(FreqDisplayForm *form)
d_parent, SLOT(notifyTriggerLevelPlus()));
connect(d_trigger_level_minus, SIGNAL(pressed(void)),
d_parent, SLOT(notifyTriggerLevelMinus()));
+
+ connect(d_stop_button, SIGNAL(pressed(void)),
+ d_parent, SLOT(setStop(void)));
}
FreqControlPanel::~FreqControlPanel()
@@ -191,10 +204,12 @@ FreqControlPanel::~FreqControlPanel()
removeWidget(d_trace_box);
removeWidget(d_fft_box);
removeWidget(d_trigger_box);
+ removeWidget(d_extras_box);
delete d_axes_box;
delete d_trace_box;
delete d_fft_box;
delete d_trigger_box;
+ delete d_extras_box;
// All other children of the boxes are automatically deleted.
}
- [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, 2015/04/06
- [Commit-gnuradio] [gnuradio] 07/08: qtgui: added stop button to freq control panel.,
git <=
- [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