summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-02-20 17:33:05 -0500
committerTom Rondeau <trondeau@vt.edu>2013-02-20 18:36:45 -0500
commit844a6e15b34d8106752bbf3783b3eb8b65728cac (patch)
tree9af8e62eac7668ce950c7c555d0299499b491880 /gnuradio-core/src/lib
parent11746e7de98462a6d6a9917e0500077ed063a1d7 (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')
-rw-r--r--gnuradio-core/src/lib/general/gr_ctrlport_probe2_c.cc3
-rw-r--r--gnuradio-core/src/lib/general/gr_ctrlport_probe_c.cc3
-rw-r--r--gnuradio-core/src/lib/general/gr_throttle.cc6
-rw-r--r--gnuradio-core/src/lib/runtime/gnuradio.ice24
-rw-r--r--gnuradio-core/src/lib/runtime/gr_block.cc30
-rw-r--r--gnuradio-core/src/lib/runtime/nop_impl.cc8
-rw-r--r--gnuradio-core/src/lib/runtime/rpccallbackregister_base.h27
-rw-r--r--gnuradio-core/src/lib/runtime/rpcserver_ice.h4
-rw-r--r--gnuradio-core/src/lib/runtime/runtime.i27
9 files changed, 78 insertions, 54 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
}
};
diff --git a/gnuradio-core/src/lib/runtime/gnuradio.ice b/gnuradio-core/src/lib/runtime/gnuradio.ice
index 8fa909417e..e17d91901b 100644
--- a/gnuradio-core/src/lib/runtime/gnuradio.ice
+++ b/gnuradio-core/src/lib/runtime/gnuradio.ice
@@ -52,23 +52,23 @@ enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT,
KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE,
KNOBVECSTRING, KNOBVECLONG };
-enum DisplayType {
- DISPNULL,
- DISPTIMESERIESF,
- DISPTIMESERIESC,
- DISPXYSCATTER,
- DISPXYLINE,
- DISPLOGTIMESERIESF,
- DISPLOGTIMESERIESC,
- DISPSTRIPCHARTF,
- DISPSTRIPCHARTC,
-};
+const int DISPNULL = 0x0000;
+const int DISPTIME = 0x0001;
+const int DISPXY = 0x0002;
+const int DISPPSD = 0x0004;
+const int DISPSPEC = 0x0008;
+const int DISPRAST = 0x0010;
+const int DISPOPTCPLX = 0x0100;
+const int DISPOPTLOG = 0x0200;
+const int DISPOPTSTEM = 0x0400;
+const int DISPOPTSTRIP = 0x0800;
+const int DISPOPTSCATTER = 0x1000;
struct KnobProp {
KnobType type;
string units;
string description;
- DisplayType display;
+ int display;
Knob min;
Knob max;
Knob defaultvalue;
diff --git a/gnuradio-core/src/lib/runtime/gr_block.cc b/gnuradio-core/src/lib/runtime/gr_block.cc
index fb39909ab8..ce92c88975 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block.cc
@@ -442,61 +442,71 @@ 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, DISPSTRIPCHARTF)));
+ "", "Average noutput items", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Var. noutput items", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Average items produced", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Var. items produced", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Average clock cycles in call to work", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Var. clock cycles in call to work", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Average of how full input buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Var. of how full input buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Average of how full output buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Var. of how full output buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
#endif /* GR_CTRLPORT */
}
diff --git a/gnuradio-core/src/lib/runtime/nop_impl.cc b/gnuradio-core/src/lib/runtime/nop_impl.cc
index 6df2c0391d..def1740678 100644
--- a/gnuradio-core/src/lib/runtime/nop_impl.cc
+++ b/gnuradio-core/src/lib/runtime/nop_impl.cc
@@ -90,15 +90,15 @@ namespace gr {
(new get_32i_t(d_name, "a", this, unique_id(),
&nop_impl::a,
pmt::mp(-128), pmt::mp(127), pmt::mp(0),
- "", "Value of a",
- RPC_PRIVLVL_MIN, DISPSTRIPCHARTF)));
+ "", "Value of a", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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, DISPSTRIPCHARTF)));
+ "", "Value of b", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
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 a9a3925d94..dbfda4ed47 100644
--- a/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h
+++ b/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h
@@ -26,17 +26,22 @@
#include <gruel/msg_accepter.h>
#include <gruel/msg_producer.h>
-enum DisplayType {
- DISPNULL,
- DISPTIMESERIESF,
- DISPTIMESERIESC,
- DISPXYSCATTER,
- DISPXYLINE,
- DISPLOGTIMESERIESF,
- DISPLOGTIMESERIESC,
- DISPSTRIPCHARTF,
- DISPSTRIPCHARTC,
-};
+typedef uint32_t DisplayType;
+
+// DisplayType Plotting types
+const uint32_t DISPNULL = 0x0000;
+const uint32_t DISPTIME = 0x0001;
+const uint32_t DISPXY = 0x0002;
+const uint32_t DISPPSD = 0x0004;
+const uint32_t DISPSPEC = 0x0008;
+const uint32_t DISPRAST = 0x0010;
+
+// DisplayType Options
+const uint32_t DISPOPTCPLX = 0x0100;
+const uint32_t DISPOPTLOG = 0x0200;
+const uint32_t DISPOPTSTEM = 0x0400;
+const uint32_t DISPOPTSTRIP = 0x0800;
+const uint32_t DISPOPTSCATTER = 0x1000;
enum priv_lvl_t {
RPC_PRIVLVL_ALL = 0,
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_ice.h b/gnuradio-core/src/lib/runtime/rpcserver_ice.h
index 98847bbe05..66ed8d5156 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_ice.h
+++ b/gnuradio-core/src/lib/runtime/rpcserver_ice.h
@@ -162,7 +162,7 @@ private:
prop.description = p.second.description;
prop.min = rpcpmtconverter::from_pmt(p.second.min, c);
prop.max = rpcpmtconverter::from_pmt(p.second.max, c);
- prop.display = static_cast<GNURadio::DisplayType>(p.second.display);
+ prop.display = static_cast<uint32_t>(p.second.display);
outknobs[p.first] = prop;
}
else {
@@ -197,7 +197,7 @@ private:
prop.description = iter->second.description;
prop.min = rpcpmtconverter::from_pmt(iter->second.min, c);
prop.max = rpcpmtconverter::from_pmt(iter->second.max, c);
- prop.display = static_cast<GNURadio::DisplayType>(iter->second.display);
+ prop.display = static_cast<uint32_t>(iter->second.display);
//outknobs[iter->first] = prop;
outknobs[p] = prop;
}
diff --git a/gnuradio-core/src/lib/runtime/runtime.i b/gnuradio-core/src/lib/runtime/runtime.i
index ea6b7f79ac..c3510a65e2 100644
--- a/gnuradio-core/src/lib/runtime/runtime.i
+++ b/gnuradio-core/src/lib/runtime/runtime.i
@@ -71,17 +71,22 @@
#ifdef GR_CTRLPORT
-enum DisplayType {
- DISPNULL,
- DISPTIMESERIESF,
- DISPTIMESERIESC,
- DISPXYSCATTER,
- DISPXYLINE,
- DISPLOGTIMESERIESF,
- DISPLOGTIMESERIESC,
- DISPSTRIPCHARTF,
- DISPSTRIPCHARTC,
-};
+typedef uint32_t DisplayType;
+
+// DisplayType Plotting types
+const uint32_t DISPNULL = 0x0000;
+const uint32_t DISPTIME = 0x0001;
+const uint32_t DISPXY = 0x0002;
+const uint32_t DISPPSD = 0x0004;
+const uint32_t DISPSPEC = 0x0008;
+const uint32_t DISPRAST = 0x0010;
+
+// DisplayType Options
+const uint32_t DISPOPTCPLX = 0x0100;
+const uint32_t DISPOPTLOG = 0x0200;
+const uint32_t DISPOPTSTEM = 0x0400;
+const uint32_t DISPOPTSTRIP = 0x0800;
+const uint32_t DISPOPTSCATTER = 0x1000;
enum priv_lvl_t {
RPC_PRIVLVL_ALL = 0,
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-26 02:29:56 +0000