[Commit-gnuradio] r11213 - gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital

[trondeau]

Author: trondeau
Date: 2009-06-16 21:51:07 -0600 (Tue, 16 Jun 2009)
New Revision: 11213

Modified:
   
gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/benchmark_qt_loopback.py
Log:
Fixing some bugs

Modified: 
gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/benchmark_qt_loopback.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/benchmark_qt_loopback.py
   2009-06-17 03:11:54 UTC (rev 11212)
+++ 
gnuradio/branches/developers/trondeau/qtdigital/gnuradio-examples/python/digital/benchmark_qt_loopback.py
   2009-06-17 03:51:07 UTC (rev 11213)
@@ -4,8 +4,7 @@
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-from PyQt4 import QtGui, QtCore
-import sip, random, time, struct, sys, os, math
+import random, time, struct, sys, os, math
 
 from threading import Thread
 
@@ -15,6 +14,8 @@
 
 try:
     from gnuradio.qtgui import qtgui
+    from PyQt4 import QtGui, QtCore
+    import sip
 except ImportError:
     print "Please install gr-qtgui."
     sys.exit(1)
@@ -103,7 +104,7 @@
         try:
             rate = self.gui.sampleRateEdit.text().toAscii()
             srate = eng_notation.str_to_num(rate)
-            self.fg.set_sample_rate(srate)
+            #self.fg.set_sample_rate(srate)
         except RuntimeError:
             pass
 
@@ -200,8 +201,6 @@
         self.throttle = gr.throttle(gr.sizeof_gr_complex, self.sample_rate())
         self.rxpath = receive_path(demod_class, rx_callback, options)
 
-        print dir(self.throttle)
-
         # FIXME: do better exposure to lower issues for control
         self._gain_mu = self.rxpath.packet_receiver._demodulator._mm_gain_mu
         self._alpha = self.rxpath.packet_receiver._demodulator._costas_alpha
@@ -235,12 +234,15 @@
                 self.snk_rx = qtgui.sink_c(fftsize, 
gr.firdes.WIN_BLACKMAN_hARRIS,
                                            -1/2, 1/2,
                                            "Rx", True, True, False, True, True)
-                
+
+                self.snk_tx.set_frequency_axis(0, 80)
+                self.snk_rx.set_frequency_axis(-60, 20)
+            
                 # Connect to the QT sinks
                 # FIXME: make better exposure to receiver from rxpath
+                self.receiver = 
self.rxpath.packet_receiver._demodulator.receiver
                 self.connect(self.channel, self.snk_tx)
-                self.connect(self.rxpath.packet_receiver._demodulator.receiver,
-                             self.snk_rx)
+                self.connect(self.receiver, self.snk_rx)
 
                 pyTxQt  = self.snk_tx.pyqwidget()
                 pyTx = sip.wrapinstance(pyTxQt, QtGui.QWidget)
@@ -263,7 +265,7 @@
     
     def set_sample_rate(self, sr):
         self._sample_rate = sr
-        self.throttle.set_samples_per_second(self._sample_rate)
+        #self.throttle.set_samples_per_second(self._sample_rate)
 
     # Channel Model Parameters
     def snr(self):