diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-17 19:56:21 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-17 19:56:21 -0500 |
| commit | 6b3b5a5757bea2e89738aeaa6077abc9cb847b44 (patch) | |
| tree | 367507b09f121664aab8cc227ea7d14515b962c8 /gnuradio-core/src/lib/runtime | |
| parent | 79c51dce02f1a6f45faf60cabca2820de959ffdb (diff) | |
ctrlport: adding display type for stripchart as opposed to timeseries.
Stripcharts add data to the back of what's plotted; time series plots just plot the vector given. All single-value RPC vars have been converted to use stripchart mode.
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gnuradio.ice | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.cc | 20 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/nop_impl.cc | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/rpccallbackregister_base.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/runtime.i | 2 |
5 files changed, 18 insertions, 12 deletions
diff --git a/gnuradio-core/src/lib/runtime/gnuradio.ice b/gnuradio-core/src/lib/runtime/gnuradio.ice index 4ea8d7abed..8fa909417e 100644 --- a/gnuradio-core/src/lib/runtime/gnuradio.ice +++ b/gnuradio-core/src/lib/runtime/gnuradio.ice @@ -60,6 +60,8 @@ enum DisplayType { DISPXYLINE, DISPLOGTIMESERIESF, DISPLOGTIMESERIESC, + DISPSTRIPCHARTF, + DISPSTRIPCHARTC, }; struct KnobProp { diff --git a/gnuradio-core/src/lib/runtime/gr_block.cc b/gnuradio-core/src/lib/runtime/gr_block.cc index c736d0f058..fb39909ab8 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.cc +++ b/gnuradio-core/src/lib/runtime/gr_block.cc @@ -442,61 +442,61 @@ gr_block::setup_pc_rpc() rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>( alias(), "avg noutput_items", &gr_block::pc_noutput_items, pmt::mp(0), pmt::mp(32768), pmt::mp(0), - "", "Average noutput items", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Average noutput items", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>( alias(), "var noutput_items", &gr_block::pc_noutput_items_var, pmt::mp(0), pmt::mp(32768), pmt::mp(0), - "", "Var. noutput items", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Var. noutput items", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>( alias(), "avg nproduced", &gr_block::pc_nproduced, pmt::mp(0), pmt::mp(32768), pmt::mp(0), - "", "Average items produced", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Average items produced", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>( alias(), "var nproduced", &gr_block::pc_nproduced_var, pmt::mp(0), pmt::mp(32768), pmt::mp(0), - "", "Var. items produced", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Var. items produced", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>( alias(), "avg work time", &gr_block::pc_work_time, pmt::mp(0), pmt::mp(1e9), pmt::mp(0), - "", "Average clock cycles in call to work", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Average clock cycles in call to work", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>( alias(), "var work time", &gr_block::pc_work_time_var, pmt::mp(0), pmt::mp(1e9), pmt::mp(0), - "", "Var. clock cycles in call to work", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Var. clock cycles in call to work", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >( alias(), "avg input \% full", &gr_block::pc_input_buffers_full, pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0), - "", "Average of how full input buffers are", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Average of how full input buffers are", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >( alias(), "var input \% full", &gr_block::pc_input_buffers_full_var, pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0), - "", "Var. of how full input buffers are", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Var. of how full input buffers are", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >( alias(), "avg output \% full", &gr_block::pc_output_buffers_full, pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0), - "", "Average of how full output buffers are", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Average of how full output buffers are", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >( alias(), "var output \% full", &gr_block::pc_output_buffers_full_var, pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0), - "", "Var. of how full output buffers are", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + "", "Var. of how full output buffers are", RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); #endif /* GR_CTRLPORT */ } diff --git a/gnuradio-core/src/lib/runtime/nop_impl.cc b/gnuradio-core/src/lib/runtime/nop_impl.cc index b6764c2257..6df2c0391d 100644 --- a/gnuradio-core/src/lib/runtime/nop_impl.cc +++ b/gnuradio-core/src/lib/runtime/nop_impl.cc @@ -91,14 +91,14 @@ namespace gr { &nop_impl::a, pmt::mp(-128), pmt::mp(127), pmt::mp(0), "", "Value of a", - RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_get_32i_rpcs.push_back(get_32i_sptr (new get_32i_t(d_name, "b", this, unique_id(), &nop_impl::b, pmt::mp(-128), pmt::mp(127), pmt::mp(0), "", "Value of b", - RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + RPC_PRIVLVL_MIN, DISPSTRIPCHARTF))); d_set_32i_rpcs.push_back(set_32i_sptr (new set_32i_t(d_name, "a", this, unique_id(), diff --git a/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h b/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h index c5b94cb757..a9a3925d94 100644 --- a/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h +++ b/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h @@ -34,6 +34,8 @@ enum DisplayType { DISPXYLINE, DISPLOGTIMESERIESF, DISPLOGTIMESERIESC, + DISPSTRIPCHARTF, + DISPSTRIPCHARTC, }; enum priv_lvl_t { diff --git a/gnuradio-core/src/lib/runtime/runtime.i b/gnuradio-core/src/lib/runtime/runtime.i index 1a31cfbd73..ea6b7f79ac 100644 --- a/gnuradio-core/src/lib/runtime/runtime.i +++ b/gnuradio-core/src/lib/runtime/runtime.i @@ -79,6 +79,8 @@ enum DisplayType { DISPXYLINE, DISPLOGTIMESERIESF, DISPLOGTIMESERIESC, + DISPSTRIPCHARTF, + DISPSTRIPCHARTC, }; enum priv_lvl_t { |