[Commit-gnuradio] r5476 - in grc/trunk: notes src src/Graphics src/SignalBlockDefs

[jblum]

Author: jblum
Date: 2007-05-15 14:58:19 -0600 (Tue, 15 May 2007)
New Revision: 5476

Modified:
   grc/trunk/notes/notes.txt
   grc/trunk/src/FlowGraphApp.py
   grc/trunk/src/Graphics/USRPDiagnostics.py
   grc/trunk/src/Preferences.py
   grc/trunk/src/SignalBlockDefs/USRP.py
Log:
changed usrp diagnostics to display 8 digit hex values, removed amplitude 
message in usrp sinks

Modified: grc/trunk/notes/notes.txt
===================================================================
--- grc/trunk/notes/notes.txt   2007-05-15 20:46:42 UTC (rev 5475)
+++ grc/trunk/notes/notes.txt   2007-05-15 20:58:19 UTC (rev 5476)
@@ -12,10 +12,9 @@
 -socket controllers should be intelligent on shrinkage
 
 ############   Features to Add:        ####################
--save settings after close (working directory, window size...)
+-save settings after close (working directory)
 -create sub-flow graphs to be used in larger flow graphs
 -math expressions, pi, e, sin, cos, tan, log, ln
--organize examples
 -stdin/out communication protocal
 
 ############   wxPython Features:      ####################

Modified: grc/trunk/src/FlowGraphApp.py
===================================================================
--- grc/trunk/src/FlowGraphApp.py       2007-05-15 20:46:42 UTC (rev 5475)
+++ grc/trunk/src/FlowGraphApp.py       2007-05-15 20:58:19 UTC (rev 5476)
@@ -52,8 +52,8 @@
                for obj in (label, text_box):   #fill the container with label 
and text entry box
                        label_text_sizer.Add(obj, 0, 
wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL)
                self.Add(label_text_sizer, 0, wx.ALIGN_CENTER)
-               ###     Determine the slider width based on the number of steps 
###
-               self.num_steps = num_steps = 
(float(max)-float(min))/float(step)        
+               ###     Determine the slider width based on the number of steps 
###             
+               self.num_steps = num_steps = 
(float(max)-float(min))/float(step)                        
                if num_steps == DEFAULT_SLIDER_STEPS: slider_width = 
DEFAULT_SLIDER_WIDTH
                elif num_steps > DEFAULT_SLIDER_STEPS:  # make the slider wider 
than default
                        slider_width = MAX_SLIDER_WIDTH - 
(MAX_SLIDER_WIDTH-DEFAULT_SLIDER_WIDTH)*DEFAULT_SLIDER_STEPS/num_steps
@@ -62,7 +62,11 @@
                self.slider_width = slider_width = int(slider_width)    #make 
sure width is an integer number of pixels
                ### make the slider     ###                             
                self.slider = slider = wx.Slider(parent, -1, 
size=wx.Size(slider_width, SLIDER_HEIGHT), style=wx.SL_HORIZONTAL)              
           
-               slider.SetRange(0, num_steps)
+               try:            
+                       slider.SetRange(0, num_steps)
+               except Exception, e:
+                       sys.stderr.write('Slider, "%s", has too many 
steps!\n'%key)
+                       sys.exit(1)
                slider.Bind(wx.EVT_SCROLL, self.handle_scroll)  #bind the 
scrolling event               
                self.Add(slider, 0, wx.ALIGN_CENTER)
                self.handle_enter()#sets the slider's value

Modified: grc/trunk/src/Graphics/USRPDiagnostics.py
===================================================================
--- grc/trunk/src/Graphics/USRPDiagnostics.py   2007-05-15 20:46:42 UTC (rev 
5475)
+++ grc/trunk/src/Graphics/USRPDiagnostics.py   2007-05-15 20:58:19 UTC (rev 
5476)
@@ -81,7 +81,7 @@
                        subdev = usrp.selected_subdev(u, subdev_spec)#get the 
subdev
                        msg = ">>> USRP Query\n"
                        msg = "%s\nName:\n\t%s\n"%(msg,str(subdev.name()))
-                       msg = "%s\nAutomated Mux:\n\t%s\n"%(msg,hex(get_mux(u, 
subdev_spec)))
+                       msg = "%s\nAutomated Mux:\n\t0x%08x\n"%(msg, 
0xFFFFFFFFL & long(get_mux(u, subdev_spec))) #ensure that the value is 
displayed as: 8 nibbles, unsigned, hex
                        msg = "%s\nConverter 
Rate:\n\t%s\n"%(msg,u.converter_rate())
                        msg = "%s\nUses Quadrature:\n\t%s\n"%(msg, 
str(subdev.is_quadrature()))
                        gain_min, gain_max, gain_step = subdev.gain_range()

Modified: grc/trunk/src/Preferences.py
===================================================================
--- grc/trunk/src/Preferences.py        2007-05-15 20:46:42 UTC (rev 5475)
+++ grc/trunk/src/Preferences.py        2007-05-15 20:58:19 UTC (rev 5476)
@@ -32,7 +32,7 @@
 CONNECTION_CHECKING_PREF = Param('Connection Checking', Bool(true='Match Data 
Types', false='Ignore Data Types', default=True))
 PARAM_CHECKING_PREF = Param('Parameter Checking', Bool(true='Verify 
Parameters', false='Ignore Invalid Params', default=True))
 SOCKET_CHECKING_PREF = Param('Socket Checking', Bool(true='Require 
Connections', false='Allow Open Sockets', default=True))
-RESTORE_FLOW_GRAPH_PREF = Param('Restore Flow Graph', Bool(true='Overwrite 
Default Flow Graph', false='Keep Default Flow Graph', default=False))
+RESTORE_FLOW_GRAPH_PREF = Param('Restore Flow Graph', Bool(true='Overwrite 
Default Flow Graph', false='Keep Default Flow Graph', default=True))
 DEFAULT_FLOW_GRAPH_PREF = Param('Default Flow Graph', FileOpen('', 
allow_blank=True))
 SNAP_TO_GRID_PREF = Param('Snap to Grid', Bool(true='On', false='Off', 
default=False))
 GRID_SIZE_PREF = Param('Grid Size (pixels)', Enum([
@@ -64,9 +64,9 @@
                ]),
        ("File Paths", '''\
 The default flow graph controls which flow graph will be loaded when the 
program is started. \
-If the default flow graph is left blank, no flow graph will be loaded at 
start-up. \
+If the default flow graph is left blank, a blank flow graph will be loaded at 
start-up. \
 File paths passed via a command line argument always proceed the default flow 
graph. \
-Upon exit, if the overwrite option is set, the default flow graph will be 
overwritten with the last open flow graph. \
+Upon exit, if the overwrite option is set, the default flow graph will be 
overwritten with the current flow graph. \
 ''', [
                RESTORE_FLOW_GRAPH_PREF,
                DEFAULT_FLOW_GRAPH_PREF,        

Modified: grc/trunk/src/SignalBlockDefs/USRP.py
===================================================================
--- grc/trunk/src/SignalBlockDefs/USRP.py       2007-05-15 20:46:42 UTC (rev 
5475)
+++ grc/trunk/src/SignalBlockDefs/USRP.py       2007-05-15 20:58:19 UTC (rev 
5476)
@@ -96,8 +96,7 @@
        sb.set_docs('''\
 The USRP sink inputs 128 Megasamples per second / interpolation.
 If left at 0, the Mux value will be automatically determined. \
-Otherwise, the Mux value must be in hexidecimal format.
-The input samples must be large in amplitude, greater than 10,000. ''')
+Otherwise, the Mux value must be in hexidecimal format.''')
        def make(fg, type, number, subdev_spec, frequency, interp, gain, mux):
                number = number.parse()
                subdev_spec = subdev_spec.parse()       
@@ -135,8 +134,7 @@
 Default mux is %s. 
 This will use all 4 DACs: 
 DAC0 and DAC1 will get channel A (I & Q).
-DAC3 and DAC2 will get channel B (I & Q).
-The input samples must be large in amplitude, greater than 
10,000.'''%default_mux)
+DAC3 and DAC2 will get channel B (I & Q).'''%default_mux)
        def make(fg, type, number, frequency_a, frequency_b, interp, gain_a, 
gain_b, mux):
                number = number.parse()
                u = type.parse()[0](number, nchan=2)