Merged r10463:10658 from jblum/gui_guts into trunk. Trunk passes distcheck.

[debian/gnuradio] / gr-wxgui / src / python / constants.py

diff --git a/gr-wxgui/src/python/constants.py b/gr-wxgui/src/python/constants.py
index 06c5a44f10a56a7520efe200028aaa602a3732ee..a4ccdca6dff8c7e71e563af7901a4b367cb75cf4 100644 (file)
--- a/gr-wxgui/src/python/constants.py
+++ b/gr-wxgui/src/python/constants.py
@@ -36,6 +36,7 @@ FRAME_RATE_KEY = 'frame_rate'
 GAIN_MU_KEY = 'gain_mu'
 GAIN_OMEGA_KEY = 'gain_omega'
 MARKER_KEY = 'marker'
+XY_MARKER_KEY = 'xy_marker'
 MSG_KEY = 'msg'
 NUM_LINES_KEY = 'num_lines'
 OMEGA_KEY = 'omega'
@@ -43,15 +44,15 @@ PEAK_HOLD_KEY = 'peak_hold'
 REF_LEVEL_KEY = 'ref_level'
 RUNNING_KEY = 'running'
 SAMPLE_RATE_KEY = 'sample_rate'
-SCOPE_TRIGGER_CHANNEL_KEY = 'scope_trigger_channel'
-SCOPE_TRIGGER_LEVEL_KEY = 'scope_trigger_level'
-SCOPE_TRIGGER_MODE_KEY = 'scope_trigger_mode'
-SCOPE_X_CHANNEL_KEY = 'scope_x_channel'
-SCOPE_Y_CHANNEL_KEY = 'scope_y_channel'
-SCOPE_XY_MODE_KEY = 'scope_xy_mode'
 TRIGGER_CHANNEL_KEY = 'trigger_channel'
 TRIGGER_LEVEL_KEY = 'trigger_level'
 TRIGGER_MODE_KEY = 'trigger_mode'
+TRIGGER_SLOPE_KEY = 'trigger_slope'
+TRIGGER_SHOW_KEY = 'trigger_show'
+XY_MODE_KEY = 'xy_mode'
+X_CHANNEL_KEY = 'x_channel'
+Y_CHANNEL_KEY = 'y_channel'
+T_FRAC_OFF_KEY = 't_frac_off'
 T_DIVS_KEY = 't_divs'
 T_OFF_KEY = 't_off'
 T_PER_DIV_KEY = 't_per_div'
@@ -61,4 +62,7 @@ X_PER_DIV_KEY = 'x_per_div'
 Y_DIVS_KEY = 'y_divs'
 Y_OFF_KEY = 'y_off'
 Y_PER_DIV_KEY = 'y_per_div'
-
+MAXIMUM_KEY = 'maximum'
+MINIMUM_KEY = 'minimum'
+NUM_BINS_KEY = 'num_bins'
+FRAME_SIZE_KEY = 'frame_size'