diff options
| -rwxr-xr-x | gnuradio-runtime/examples/mp-sched/plot_flops.py | 4 | ||||
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 | ||||
| -rw-r--r-- | gr-qtgui/lib/FrequencyDisplayPlot.cc | 1 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqcontrolpanel.cc | 6 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqdisplayform.cc | 3 | ||||
| -rwxr-xr-x | gr-utils/python/utils/gr_plot_const | 4 | ||||
| -rw-r--r-- | gr-utils/python/utils/gr_read_file_metadata | 4 |
7 files changed, 16 insertions, 7 deletions
diff --git a/gnuradio-runtime/examples/mp-sched/plot_flops.py b/gnuradio-runtime/examples/mp-sched/plot_flops.py index c80820b8a3..9bd2ff12bb 100755 --- a/gnuradio-runtime/examples/mp-sched/plot_flops.py +++ b/gnuradio-runtime/examples/mp-sched/plot_flops.py @@ -85,10 +85,10 @@ def handle_file(input_filename): def main(): parser = ArgumentParser() - parser.add_argument('file', help='Input file', nargs=1) + parser.add_argument('file', help='Input file') args = parser.parse_args() - handle_file(args.file[0]) + handle_file(args.file) if __name__ == '__main__': diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h index ec3ef6cfd1..548d693846 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h @@ -45,6 +45,7 @@ public: public slots: void notifyAvgSlider(int val); void toggleGrid(bool en); + void toggleAxisLabels(bool en); void toggleMaxHold(bool en); void toggleMinHold(bool en); diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index 233c786d0a..2820bae2f5 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -607,7 +607,6 @@ FrequencyDisplayPlot::setYLabel(const std::string &label, if(unit.length() > 0) l += " (" + unit + ")"; setAxisTitle(QwtPlot::yLeft, QString(l.c_str())); - ((FreqDisplayZoomer*)d_zoomer)->setUnitType(unit); } void diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc index 9729005f50..8babdf0523 100644 --- a/gr-qtgui/lib/freqcontrolpanel.cc +++ b/gr-qtgui/lib/freqcontrolpanel.cc @@ -229,6 +229,12 @@ FreqControlPanel::toggleGrid(bool en) } void +FreqControlPanel::toggleAxisLabels(bool en) +{ + d_axislabels_check->setChecked(en); +} + +void FreqControlPanel::toggleMaxHold(bool en) { d_maxhold_check->setChecked(en); diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 141df5475c..21d4330722 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -177,6 +177,8 @@ FreqDisplayForm::setupControlPanel() // Connect action items in menu to controlpanel widgets connect(d_grid_act, SIGNAL(triggered(bool)), d_controlpanel, SLOT(toggleGrid(bool))); + connect(d_axislabelsmenu, SIGNAL(triggered(bool)), + d_controlpanel, SLOT(toggleAxisLabels(bool))); connect(d_sizemenu, SIGNAL(whichTrigger(int)), d_controlpanel, SLOT(toggleFFTSize(int))); connect(d_winmenu, SIGNAL(whichTrigger(gr::filter::firdes::win_type)), @@ -199,6 +201,7 @@ FreqDisplayForm::setupControlPanel() d_layout->addLayout(d_controlpanel, 0, 1); d_controlpanel->toggleGrid(d_grid_act->isChecked()); + d_controlpanel->toggleAxisLabels(d_axislabelsmenu->isChecked()); d_controlpanelmenu->setChecked(true); d_controlpanel->toggleTriggerMode(getTriggerMode()); d_controlpanel->toggleMaxHold(d_maxhold_act->isChecked()); diff --git a/gr-utils/python/utils/gr_plot_const b/gr-utils/python/utils/gr_plot_const index 28f6a540da..653a2539b4 100755 --- a/gr-utils/python/utils/gr_plot_const +++ b/gr-utils/python/utils/gr_plot_const @@ -230,11 +230,11 @@ def main(): help="Specify where to start in the file [default=%(default)r]") parser.add_argument("-R", "--sample-rate", type=float, default=1.0, help="Set the sampler rate of the data [default=%(default)r]") - parser.add_argument("file", metavar="FILE", nargs=1, + parser.add_argument("file", metavar="FILE", help="Input file with complex samples") args = parser.parse_args() - dc = draw_constellation(args.file[0], args) + dc = draw_constellation(args.file, args) if __name__ == "__main__": try: diff --git a/gr-utils/python/utils/gr_read_file_metadata b/gr-utils/python/utils/gr_read_file_metadata index 2a907687d6..a05e7ad2c7 100644 --- a/gr-utils/python/utils/gr_read_file_metadata +++ b/gr-utils/python/utils/gr_read_file_metadata @@ -76,8 +76,8 @@ if __name__ == "__main__": parser = ArgumentParser(conflict_handler="resolve", description=description) parser.add_argument("-D", "--detached", action="store_true", help="Used if header is detached.") - parser.add_argument("file", metavar="FILE", nargs=1, + parser.add_argument("file", metavar="FILE", help="Input file"); args = parser.parse_args() - main(args.file[0], args.detached) + main(args.file, args.detached) |