diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-05-10 20:00:47 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-05-10 20:00:47 -0700 |
| commit | 6af7eb5d2db7cecca4aa18b3d0959af630ec00da (patch) | |
| tree | 2c375a9c106daf7e8036dfc17078f34f4c2f6db1 | |
| parent | f63a83ae0baa84a5523d0c5c5a8ab9ef37618d88 (diff) | |
| parent | fa1cca4902b0096f39468186f8c73efbdf8ddb64 (diff) | |
Merge remote-tracking branch 'tom/qtgui/control_panel_stop' into maint
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 3 | ||||
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h | 4 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqcontrolpanel.cc | 8 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqdisplayform.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/timecontrolpanel.cc | 8 | ||||
| -rw-r--r-- | gr-qtgui/lib/timedisplayform.cc | 2 |
6 files changed, 27 insertions, 0 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h index b7036d4d7c..ce0aeedf9f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h @@ -53,9 +53,12 @@ public slots: void toggleTriggerMode(gr::qtgui::trigger_mode mode); + void toggleStopButton(); + signals: void signalAvgSlider(float val); void signalAvg(bool en); + void signalToggleStopButton(); private: FreqDisplayForm *d_parent; diff --git a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h index c8e4143dde..aabd890e6e 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h @@ -47,6 +47,10 @@ public slots: void toggleGrid(bool en); void toggleTriggerMode(gr::qtgui::trigger_mode mode); void toggleTriggerSlope(gr::qtgui::trigger_slope slope); + void toggleStopButton(); + +signals: + void signalToggleStopButton(); private: TimeDisplayForm *d_parent; diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc index da68f722c0..269b88a23d 100644 --- a/gr-qtgui/lib/freqcontrolpanel.cc +++ b/gr-qtgui/lib/freqcontrolpanel.cc @@ -196,6 +196,8 @@ FreqControlPanel::FreqControlPanel(FreqDisplayForm *form) connect(d_stop_button, SIGNAL(pressed(void)), d_parent, SLOT(setStop(void))); + connect(this, SIGNAL(signalToggleStopButton(void)), + d_stop_button, SLOT(toggle(void))); } FreqControlPanel::~FreqControlPanel() @@ -273,3 +275,9 @@ FreqControlPanel::toggleTriggerMode(gr::qtgui::trigger_mode mode) { d_trigger_mode_combo->setCurrentIndex(static_cast<int>(mode)); } + +void +FreqControlPanel::toggleStopButton() +{ + emit signalToggleStopButton(); +} diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 353c21e4f6..301d5a67cd 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -193,6 +193,8 @@ FreqDisplayForm::setupControlPanel() d_controlpanel, SLOT(toggleTriggerMode(gr::qtgui::trigger_mode))); connect(this, SIGNAL(signalTriggerMode(gr::qtgui::trigger_mode)), d_controlpanel, SLOT(toggleTriggerMode(gr::qtgui::trigger_mode))); + connect(d_stop_act, SIGNAL(triggered()), + d_controlpanel, SLOT(toggleStopButton())); d_layout->addLayout(d_controlpanel, 0, 1); diff --git a/gr-qtgui/lib/timecontrolpanel.cc b/gr-qtgui/lib/timecontrolpanel.cc index f02e536572..4c5a718f97 100644 --- a/gr-qtgui/lib/timecontrolpanel.cc +++ b/gr-qtgui/lib/timecontrolpanel.cc @@ -163,6 +163,8 @@ TimeControlPanel::TimeControlPanel(TimeDisplayForm *form) d_parent, SLOT(autoScaleShot(void))); connect(d_stop_button, SIGNAL(pressed(void)), d_parent, SLOT(setStop(void))); + connect(this, SIGNAL(signalToggleStopButton(void)), + d_stop_button, SLOT(toggle(void))); } TimeControlPanel::~TimeControlPanel() @@ -200,3 +202,9 @@ TimeControlPanel::toggleTriggerSlope(gr::qtgui::trigger_slope slope) { d_trigger_slope_combo->setCurrentIndex(static_cast<int>(slope)); } + +void +TimeControlPanel::toggleStopButton() +{ + emit signalToggleStopButton(); +} diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 160cf14d89..b8718c57de 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -196,6 +196,8 @@ TimeDisplayForm::setupControlPanel() d_controlpanel, SLOT(toggleTriggerSlope(gr::qtgui::trigger_slope))); connect(this, SIGNAL(signalTriggerSlope(gr::qtgui::trigger_slope)), d_controlpanel, SLOT(toggleTriggerSlope(gr::qtgui::trigger_slope))); + connect(d_stop_act, SIGNAL(triggered()), + d_controlpanel, SLOT(toggleStopButton())); d_layout->addLayout(d_controlpanel, 0, 1); d_controlpanel->toggleAutoScale(d_autoscale_act->isChecked()); |