diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-03-18 09:54:35 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-03-18 09:54:35 -0400 |
| commit | c7815ecee3f73159d28694aa6f24a7760a925267 (patch) | |
| tree | c21ddabc657bab82ee72d04d5f50dec6b518e237 | |
| parent | 37c24f24a88f7b568d8bed8cb373e596c30affd4 (diff) | |
qtgui: fixing up a few minor details; include file and ability to set accumulate checkable on startup.
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h | 5 | ||||
| -rw-r--r-- | gr-qtgui/lib/histogramdisplayform.cc | 9 | ||||
| -rw-r--r-- | gr-qtgui/lib/numberdisplayform.cc | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h index 16a64b703a..e235f1c0be 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h @@ -73,12 +73,13 @@ private: bool d_semilogx; bool d_semilogy; - + NPointsMenu *d_nptsmenu; - NPointsMenu *d_nbinsmenu; + NPointsMenu *d_nbinsmenu; QAction *d_semilogxmenu; QAction *d_semilogymenu; + QAction *d_accum_act; QAction *d_autoscalex_act; bool d_autoscalex_state; }; diff --git a/gr-qtgui/lib/histogramdisplayform.cc b/gr-qtgui/lib/histogramdisplayform.cc index 755992a873..6654c84c46 100644 --- a/gr-qtgui/lib/histogramdisplayform.cc +++ b/gr-qtgui/lib/histogramdisplayform.cc @@ -50,10 +50,10 @@ HistogramDisplayForm::HistogramDisplayForm(int nplots, QWidget* parent) connect(d_nbinsmenu, SIGNAL(whichTrigger(int)), this, SLOT(setNumBins(const int))); - QAction *accummenu = new QAction("Accumulate", this); - accummenu->setCheckable(true); - d_menu->addAction(accummenu); - connect(accummenu, SIGNAL(triggered(bool)), + QAction *d_accum_act = new QAction("Accumulate", this); + d_accum_act->setCheckable(true); + d_menu->addAction(d_accum_act); + connect(d_accum_act, SIGNAL(triggered(bool)), this, SLOT(setAccumulate(bool))); d_menu->removeAction(d_autoscale_act); @@ -199,6 +199,7 @@ HistogramDisplayForm::setAccumulate(bool en) if(en) { autoScale(true); } + d_accum_act->setChecked(en); getPlot()->setAccumulate(en); getPlot()->replot(); } diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index 3efbaecfc2..b2b3fe453a 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -22,6 +22,7 @@ #include <cmath> #include <QMessageBox> +#include <QFileDialog> #include <gnuradio/qtgui/numberdisplayform.h> #include <iostream> #include <qwt_color_map.h> |