[Commit-gnuradio] r9637 - in gnuradio/trunk/gr-wxgui: . src/python

[jblum]

Author: jblum
Date: 2008-09-21 20:37:46 -0600 (Sun, 21 Sep 2008)
New Revision: 9637

Modified:
   gnuradio/trunk/gr-wxgui/README.gl
   gnuradio/trunk/gr-wxgui/src/python/const_window.py
   gnuradio/trunk/gr-wxgui/src/python/fft_window.py
   gnuradio/trunk/gr-wxgui/src/python/number_window.py
   gnuradio/trunk/gr-wxgui/src/python/scope_window.py
   gnuradio/trunk/gr-wxgui/src/python/waterfall_window.py
Log:
config properties and rates for gl sinks

Modified: gnuradio/trunk/gr-wxgui/README.gl
===================================================================
--- gnuradio/trunk/gr-wxgui/README.gl   2008-09-21 17:57:49 UTC (rev 9636)
+++ gnuradio/trunk/gr-wxgui/README.gl   2008-09-22 02:37:46 UTC (rev 9637)
@@ -7,14 +7,23 @@
 
 [wxgui]
 style=gl
+fft_rate=30
+waterfall_rate=30
+scope_rate=30
+number_rate=5
+const_rate=5
+const_size=2048
 
+>>>The style parameter accepts 'nongl', 'gl', and 'auto', and defaults to 
'auto'.
 
-The style parameter accepts 'nongl', 'gl', and 'auto', and defaults to 'auto'.
+'nongl' forces the use of the non-GL (current) sinks.
 
-'nongl' forces the use of the non-GL (current) sinks.  
-
 'gl' forces the use of the new GL based sinks, and will raise an exception if 
the
 appropriate GL support does not exist.
 
 'auto' currently equates to 'nongl'; however, in release 3.2, this will change 
to
 use GL if possible and if not, fallback to the non-GL versions.
+
+>>>The *_rate parameter sets the frame rate for various gl sinks.
+
+>>>The const_size parameter sets the number of constellation points per frame.

Modified: gnuradio/trunk/gr-wxgui/src/python/const_window.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/const_window.py  2008-09-21 17:57:49 UTC 
(rev 9636)
+++ gnuradio/trunk/gr-wxgui/src/python/const_window.py  2008-09-22 02:37:46 UTC 
(rev 9637)
@@ -29,6 +29,7 @@
 import math
 import pubsub
 from constants import *
+from gnuradio import gr #for gr.prefs
 
 ##################################################
 # Constants
@@ -36,9 +37,9 @@
 SLIDER_STEPS = 200
 ALPHA_MIN_EXP, ALPHA_MAX_EXP = -6, -0.301
 GAIN_MU_MIN_EXP, GAIN_MU_MAX_EXP = -6, -0.301
-DEFAULT_FRAME_RATE = 5
+DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'const_rate', 5)
 DEFAULT_WIN_SIZE = (500, 400)
-DEFAULT_CONST_SIZE = 2048
+DEFAULT_CONST_SIZE = gr.prefs().get_long('wxgui', 'const_size', 2048)
 CONST_PLOT_COLOR_SPEC = (0, 0, 1)
 MARKER_TYPES = (
        ('Dot Small', 1.0),

Modified: gnuradio/trunk/gr-wxgui/src/python/fft_window.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/fft_window.py    2008-09-21 17:57:49 UTC 
(rev 9636)
+++ gnuradio/trunk/gr-wxgui/src/python/fft_window.py    2008-09-22 02:37:46 UTC 
(rev 9637)
@@ -29,6 +29,7 @@
 import math
 import pubsub
 from constants import *
+from gnuradio import gr #for gr.prefs
 
 ##################################################
 # Constants
@@ -36,7 +37,7 @@
 SLIDER_STEPS = 100
 AVG_ALPHA_MIN_EXP, AVG_ALPHA_MAX_EXP = -3, 0
 DEFAULT_WIN_SIZE = (600, 300)
-DEFAULT_FRAME_RATE = 30
+DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'fft_rate', 30)
 DIV_LEVELS = (1, 2, 5, 10, 20)
 FFT_PLOT_COLOR_SPEC = (0, 0, 1)
 PEAK_VALS_COLOR_SPEC = (0, 1, 0)

Modified: gnuradio/trunk/gr-wxgui/src/python/number_window.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/number_window.py 2008-09-21 17:57:49 UTC 
(rev 9636)
+++ gnuradio/trunk/gr-wxgui/src/python/number_window.py 2008-09-22 02:37:46 UTC 
(rev 9637)
@@ -27,6 +27,7 @@
 import wx
 import pubsub
 from constants import *
+from gnuradio import gr #for gr.prefs
 
 ##################################################
 # Constants
@@ -34,7 +35,7 @@
 NEG_INF = float('-inf')
 SLIDER_STEPS = 100
 AVG_ALPHA_MIN_EXP, AVG_ALPHA_MAX_EXP = -3, 0
-DEFAULT_NUMBER_RATE = 5
+DEFAULT_NUMBER_RATE = gr.prefs().get_long('wxgui', 'number_rate', 5)
 DEFAULT_WIN_SIZE = (300, 300)
 DEFAULT_GAUGE_RANGE = 1000
 

Modified: gnuradio/trunk/gr-wxgui/src/python/scope_window.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/scope_window.py  2008-09-21 17:57:49 UTC 
(rev 9636)
+++ gnuradio/trunk/gr-wxgui/src/python/scope_window.py  2008-09-22 02:37:46 UTC 
(rev 9637)
@@ -29,11 +29,12 @@
 import time
 import pubsub
 from constants import *
+from gnuradio import gr #for gr.prefs
 
 ##################################################
 # Constants
 ##################################################
-DEFAULT_FRAME_RATE = 30
+DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'scope_rate', 30)
 DEFAULT_WIN_SIZE = (600, 300)
 DEFAULT_V_SCALE = 1000
 TRIGGER_MODES = (

Modified: gnuradio/trunk/gr-wxgui/src/python/waterfall_window.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/waterfall_window.py      2008-09-21 
17:57:49 UTC (rev 9636)
+++ gnuradio/trunk/gr-wxgui/src/python/waterfall_window.py      2008-09-22 
02:37:46 UTC (rev 9637)
@@ -29,13 +29,14 @@
 import math
 import pubsub
 from constants import *
+from gnuradio import gr #for gr.prefs
 
 ##################################################
 # Constants
 ##################################################
 SLIDER_STEPS = 100
 AVG_ALPHA_MIN_EXP, AVG_ALPHA_MAX_EXP = -3, 0
-DEFAULT_FRAME_RATE = 30
+DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'waterfall_rate', 30)
 DEFAULT_WIN_SIZE = (600, 300)
 DIV_LEVELS = (1, 2, 5, 10, 20)
 MIN_DYNAMIC_RANGE, MAX_DYNAMIC_RANGE = 10, 200