[Commit-gnuradio] r9163 - gnuradio/branches/features/experimental-gui

[jcorgan]

Author: jcorgan
Date: 2008-08-03 12:09:09 -0600 (Sun, 03 Aug 2008)
New Revision: 9163

Modified:
   gnuradio/branches/features/experimental-gui/common.py
   gnuradio/branches/features/experimental-gui/const_top_block.py
   gnuradio/branches/features/experimental-gui/const_window.py
   gnuradio/branches/features/experimental-gui/usrp_const.py
Log:
More const display tweaks

Modified: gnuradio/branches/features/experimental-gui/common.py
===================================================================
--- gnuradio/branches/features/experimental-gui/common.py       2008-08-03 
17:44:19 UTC (rev 9162)
+++ gnuradio/branches/features/experimental-gui/common.py       2008-08-03 
18:09:09 UTC (rev 9163)
@@ -118,7 +118,7 @@
        Log slider controller with display label and slider.
        Gives logarithmic scaling to slider operation.
        """
-       def __init__(self, parent, label, min_exp, max_exp, slider_steps, 
controller, control_key, formatter=lambda x: ': %.3f'%x):
+       def __init__(self, parent, label, min_exp, max_exp, slider_steps, 
controller, control_key, formatter=lambda x: ': %.6f'%x):
                wx.BoxSizer.__init__(self, wx.VERTICAL)
                self._label = wx.StaticText(parent, -1, label + 
formatter(1/3.0))
                self.Add(self._label, 0, wx.EXPAND)

Modified: gnuradio/branches/features/experimental-gui/const_top_block.py
===================================================================
--- gnuradio/branches/features/experimental-gui/const_top_block.py      
2008-08-03 17:44:19 UTC (rev 9162)
+++ gnuradio/branches/features/experimental-gui/const_top_block.py      
2008-08-03 18:09:09 UTC (rev 9163)
@@ -45,7 +45,7 @@
                  freq=None,
                  antenna=None,
                  bit_rate=None,
-                 costas_alpha=0.1,
+                 costas_alpha=0.35,
                  costas_max=0.05,
                  mm_gain_mu=0.005,
                  mm_omega_limit=0.05

Modified: gnuradio/branches/features/experimental-gui/const_window.py
===================================================================
--- gnuradio/branches/features/experimental-gui/const_window.py 2008-08-03 
17:44:19 UTC (rev 9162)
+++ gnuradio/branches/features/experimental-gui/const_window.py 2008-08-03 
18:09:09 UTC (rev 9163)
@@ -32,12 +32,12 @@
 ##################################################
 # Constants
 ##################################################
-SLIDER_STEPS = 100
-ALPHA_MIN_EXP, ALPHA_MAX_EXP = -6, -0.7
-GAIN_MU_MIN_EXP, GAIN_MU_MAX_EXP = -6, -0.7
+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 = 30
 DEFAULT_WIN_SIZE = (500, 400)
-DEFAULT_CONST_SIZE = 1024
+DEFAULT_CONST_SIZE = 2048
 CONST_PLOT_COLOR_SPEC = (0, 0, 1)
 MARKER_TYPES = (
        ('Line', None),

Modified: gnuradio/branches/features/experimental-gui/usrp_const.py
===================================================================
--- gnuradio/branches/features/experimental-gui/usrp_const.py   2008-08-03 
17:44:19 UTC (rev 9162)
+++ gnuradio/branches/features/experimental-gui/usrp_const.py   2008-08-03 
18:09:09 UTC (rev 9163)
@@ -53,7 +53,7 @@
                      help="Select modulation from 'bpsk', 'qpsk', default is 
'bpsk'")
     parser.add_option("-r", "--rate", type="eng_float", default=500e3,
                       help="Select modulation bit rate [default=%default]")
-    parser.add_option("", "--costas-alpha", type="eng_float", default=0.1,
+    parser.add_option("", "--costas-alpha", type="eng_float", default=0.35,
                       help="Select Costas loop first order gain, 
[default=%%default]")
     parser.add_option("", "--costas-max", type="eng_float", default=0.05,
                       help="Select Costas loop max offset in radians/sample, 
[default=%default]")