[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 22/24: qtgui: fixing up a few minor details
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 22/24: qtgui: fixing up a few minor details; include file and ability to set accumulate checkable on startup. |
Date: |
Tue, 18 Mar 2014 17:51:42 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit c7815ecee3f73159d28694aa6f24a7760a925267
Author: Tom Rondeau <address@hidden>
Date: Tue Mar 18 09:54:35 2014 -0400
qtgui: fixing up a few minor details; include file and ability to set
accumulate checkable on startup.
---
gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h | 5 +++--
gr-qtgui/lib/histogramdisplayform.cc | 9 +++++----
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 16a64b7..e235f1c 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 755992a..6654c84 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 3efbaec..b2b3fe4 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>
- [Commit-gnuradio] [gnuradio] 15/24: grc: tabbed probs: fix initial error box height, (continued)
- [Commit-gnuradio] [gnuradio] 15/24: grc: tabbed probs: fix initial error box height, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 14/24: grc: tabbed props: no more double entries, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 06/24: qtgui: Adding a Number sink with options to set autoscale, layout style, colors, averaging., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 04/24: Simplify some more., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 03/24: Move correlate_access_code_tag_bb to non-deprecated GRC category and deprecate the older correlate_access_code_bb., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 20/24: Merge remote-tracking branch 'skoslowski/grc_show_missing_blocks', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 09/24: grc: tabbed PropsDialog, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 19/24: Merge remote-tracking branch 'gnuradio-wg-grc/grc_pygtk_backw_compat_fixes', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 12/24: grc: special colors for missing blocks, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 18/24: qtgui: fixes number sink to handle Python/C++ exposure (see: 6a78af5919133 and d9dbb6b489deb), git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 22/24: qtgui: fixing up a few minor details; include file and ability to set accumulate checkable on startup.,
git <=
- [Commit-gnuradio] [gnuradio] 10/24: Merge branch 'qtgui_numsink', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 02/24: Simplify correlate_access_code_tag_bb and fix bug leading to false trigger., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 23/24: Merge remote-tracking branch 'mbant/doxygen-updates', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 16/24: qtgui: fixed number display for qwt 5.2, 6.0, and 6.1., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 08/24: gr-qtgui: Expose the qwidget() method in the public interface, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 21/24: Merge remote-tracking branch 'bistromath/corr_tag', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 24/24: Merge branch 'maint', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 01/24: docs: Updated Doxy files, added search bar, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 13/24: qtgui: adding a 'config' tab to qtgui sinks to set display/line config options (style, width, colors, etc.), git, 2014/03/18