diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-20 17:33:05 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-20 18:36:45 -0500 |
| commit | 844a6e15b34d8106752bbf3783b3eb8b65728cac (patch) | |
| tree | 9af8e62eac7668ce950c7c555d0299499b491880 /gnuradio-core/src/lib/general | |
| parent | 11746e7de98462a6d6a9917e0500077ed063a1d7 (diff) | |
ctrlport: made display type in ControlPort setup field into an options mask.
Options are used to determine default plot type, type of plots available, initial states.
qtgui: fixed enabling stem plot to properly check the menu option.
Diffstat (limited to 'gnuradio-core/src/lib/general')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_ctrlport_probe2_c.cc | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_ctrlport_probe_c.cc | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_throttle.cc | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/general/gr_ctrlport_probe2_c.cc b/gnuradio-core/src/lib/general/gr_ctrlport_probe2_c.cc index 1b78a9cbc3..ca6667a214 100644 --- a/gnuradio-core/src/lib/general/gr_ctrlport_probe2_c.cc +++ b/gnuradio-core/src/lib/general/gr_ctrlport_probe2_c.cc @@ -138,7 +138,8 @@ gr_ctrlport_probe2_c::setup_rpc() pmt::make_c32vector(0,-2), pmt::make_c32vector(0,2), pmt::make_c32vector(0,0), - "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, DISPXYSCATTER))); + "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, + DISPXY | DISPOPTSCATTER))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_ctrlport_probe2_c, int>( diff --git a/gnuradio-core/src/lib/general/gr_ctrlport_probe_c.cc b/gnuradio-core/src/lib/general/gr_ctrlport_probe_c.cc index e06f27eb70..253d4c380e 100644 --- a/gnuradio-core/src/lib/general/gr_ctrlport_probe_c.cc +++ b/gnuradio-core/src/lib/general/gr_ctrlport_probe_c.cc @@ -90,6 +90,7 @@ gr_ctrlport_probe_c::setup_rpc() pmt::make_c32vector(0,-2), pmt::make_c32vector(0,2), pmt::make_c32vector(0,0), - "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, DISPXYSCATTER))); + "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, + DISPXY | DISPOPTSCATTER))); #endif /* GR_CTRLPORT */ } diff --git a/gnuradio-core/src/lib/general/gr_throttle.cc b/gnuradio-core/src/lib/general/gr_throttle.cc index d293e1c540..1c6c8cf893 100644 --- a/gnuradio-core/src/lib/general/gr_throttle.cc +++ b/gnuradio-core/src/lib/general/gr_throttle.cc @@ -89,12 +89,14 @@ private: rpcbasic_sptr(new rpcbasic_register_get<gr_throttle_impl, double>( alias(), "sample_rate", &gr_throttle_impl::sample_rate, pmt::mp(0.0), pmt::mp(100.0e6), pmt::mp(0.0), - "Hz", "Sample Rate", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); + "Hz", "Sample Rate", RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_set<gr_throttle_impl, double>( alias(), "sample_rate", &gr_throttle_impl::set_sample_rate, pmt::mp(0.0), pmt::mp(100.0e6), pmt::mp(0.0), - "Hz", "Sample Rate", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); + "Hz", "Sample Rate", RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP))); #endif } }; |