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

[jblum]

Author: jblum
Date: 2007-09-17 22:17:18 -0600 (Mon, 17 Sep 2007)
New Revision: 6460

Modified:
   grc/trunk/notes/notes.txt
   grc/trunk/src/ActionHandler.py
   grc/trunk/src/Constants.py
   grc/trunk/src/Graphics/FlowGraph.py
   grc/trunk/src/Graphics/MainWindow.py
   grc/trunk/src/SignalBlockDefs/Packet.py
Log:
removed debug, comments, misc changes

Modified: grc/trunk/notes/notes.txt
===================================================================
--- grc/trunk/notes/notes.txt   2007-09-18 04:10:50 UTC (rev 6459)
+++ grc/trunk/notes/notes.txt   2007-09-18 04:17:18 UTC (rev 6460)
@@ -1,6 +1,5 @@
 ############   Blocks to Add:  ####################
 -ofdm
--usrp misc settings?
 -usrp quad souce, set z == 1 to ignore Q inputs 
 -multi-channel scope
 
@@ -16,8 +15,8 @@
 -save working directory after close
 -create sub-flow graphs to be used in larger flow graphs
 -include dtd in saved flow graphs
--immediate display of tool tips in entry boxes
 -fm demod example with expansion of wfm_recv block
+-about: release date, gnuradio trunk revision and compadible releases
 
 ############   wxPython Features:      ####################
 -dump wx running graph to png?

Modified: grc/trunk/src/ActionHandler.py
===================================================================
--- grc/trunk/src/ActionHandler.py      2007-09-18 04:10:50 UTC (rev 6459)
+++ grc/trunk/src/ActionHandler.py      2007-09-18 04:17:18 UTC (rev 6460)
@@ -147,7 +147,6 @@
                contructors of many of the classes used in this application 
enabling them to report any state change.
                @param state a string describing the state change
                """
-               print '>>>',state
                
##############################################################################################
                #       Initalize/Quit
                
##############################################################################################
@@ -322,7 +321,7 @@
                        MUTEX.unlock()
                elif state == '': #pass and run the global actions
                        pass
-               else: print "!!! State not handled !!!" 
+               else: print '!!! State "%s" not handled !!!'%state
                
##############################################################################################
                #       Global Actions for all States
                
##############################################################################################
@@ -333,8 +332,7 @@
                MUTEX.unlock()
                #saved status           
                get_action_from_name(FLOW_GRAPH_SAVE).set_sensitive(not 
self.get_page().get_saved())
-               self.main_window.set_title()
-               Preferences.show_reports_window(self.main_window)               
+               self.main_window.update()                               
                                
 class ExecFlowGraphThread(Thread):
        """Execute the flow graph as a new process and wait on it to finish."""

Modified: grc/trunk/src/Constants.py
===================================================================
--- grc/trunk/src/Constants.py  2007-09-18 04:10:50 UTC (rev 6459)
+++ grc/trunk/src/Constants.py  2007-09-18 04:17:18 UTC (rev 6460)
@@ -36,9 +36,6 @@
 ##The current version of this code
 VERSION = '0.69 beta'
 
-##The release date for this version as a unix timestamp
-RELEASE_STAMP = None
-
 ##The name to appear in the main window for a flow graph that has not been 
saved to file.
 NEW_FLOGRAPH_TITLE = 'untitled'
 

Modified: grc/trunk/src/Graphics/FlowGraph.py
===================================================================
--- grc/trunk/src/Graphics/FlowGraph.py 2007-09-18 04:10:50 UTC (rev 6459)
+++ grc/trunk/src/Graphics/FlowGraph.py 2007-09-18 04:17:18 UTC (rev 6460)
@@ -267,7 +267,6 @@
                
        def update(self):
                """Call update on all elements."""      
-               print "Updating entire flow graph..."
                for element in self.elements: element.update()  
                self.draw()
                
@@ -373,7 +372,6 @@
                width, height = self.get_size_request()
                if self.pixmap == None or (width, height) != 
self.pixmap.get_size():            
                        self.pixmap = gtk.gdk.Pixmap(self.window, width, 
height, -1)
-                       print "Main Pixmap Created!"
                self.draw()
 
 ##########################################################################

Modified: grc/trunk/src/Graphics/MainWindow.py
===================================================================
--- grc/trunk/src/Graphics/MainWindow.py        2007-09-18 04:10:50 UTC (rev 
6459)
+++ grc/trunk/src/Graphics/MainWindow.py        2007-09-18 04:17:18 UTC (rev 
6460)
@@ -331,9 +331,11 @@
        ##      Misc
        ############################################################
 
-       def set_title(self):
+       def update(self):
                """!
-               Set the title and prepend the program name.
+               Set the title of the main window.
+               Set the titles on the page tabs.
+               Show/hide the reports window.
                @param title the window title
                """     
                if self.get_page():
@@ -354,6 +356,8 @@
                                        )
                                )
                        )
+               #reports window
+               Preferences.show_reports_window(self)
                        
        def get_flow_graph(self):
                """

Modified: grc/trunk/src/SignalBlockDefs/Packet.py
===================================================================
--- grc/trunk/src/SignalBlockDefs/Packet.py     2007-09-18 04:10:50 UTC (rev 
6459)
+++ grc/trunk/src/SignalBlockDefs/Packet.py     2007-09-18 04:17:18 UTC (rev 
6460)
@@ -64,23 +64,23 @@
                """
                Run this thread by sampling the message queue in and cutting 
out chunks of size payload.
                """
-               s = '' #residual sample
+               sample = '' #residual sample
                while self.keep_running:
                        msg = self._msgq.delete_head() #blocking read of 
message queue
-                       s = s + msg.to_string() #get the body of the msg as a 
string    
-                       while len(s) >= self._payload_length:           
-                               p = s[0:self._payload_length]
-                               s = s[self._payload_length:]                    
-                               self._send_payload(p)   
+                       sample = sample + msg.to_string() #get the body of the 
msg as a string  
+                       while len(sample) >= self._payload_length:              
+                               payload = sample[0:self._payload_length]
+                               sample = sample[self._payload_length:]          
        
+                               self._send_payload(payload)     
 
 class PacketModHelper(gr.hier_block2):
        """
-       Block-based packet modulator.
+       Hierarchical block for sending packet based data.               
        """
        
        def __init__(self, item_size, samples_per_symbol, bits_per_symbol, 
payload_length=None, access_code=None, pad_for_usrp=True):
                """!
-               Hierarchical block for sending packet based data.               
+               PacketModHelper constructor.
                @param item_size the size of the input data stream in bytes
                @param samples_per_symbol number of samples per symbol
                @param bits_per_symbol number of bits per symbol
@@ -176,7 +176,7 @@
        return sb, make
        
 
#######################################################################################
-## Packet Demod
+##     Packet Demod
 
#######################################################################################
 
 class PacketDemodThread(threading.Thread):