[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9195 - gnuradio/branches/features/experimental-gui
From: |
jblum |
Subject: |
[Commit-gnuradio] r9195 - gnuradio/branches/features/experimental-gui |
Date: |
Wed, 6 Aug 2008 14:12:04 -0600 (MDT) |
Author: jblum
Date: 2008-08-06 14:12:03 -0600 (Wed, 06 Aug 2008)
New Revision: 9195
Modified:
gnuradio/branches/features/experimental-gui/waterfall_window.py
gnuradio/branches/features/experimental-gui/waterfallsink.py
Log:
timescale through decim
Modified: gnuradio/branches/features/experimental-gui/waterfall_window.py
===================================================================
--- gnuradio/branches/features/experimental-gui/waterfall_window.py
2008-08-06 20:11:53 UTC (rev 9194)
+++ gnuradio/branches/features/experimental-gui/waterfall_window.py
2008-08-06 20:12:03 UTC (rev 9195)
@@ -111,7 +111,6 @@
self.clear_button.Bind(wx.EVT_BUTTON, self._on_clear_button)
control_box.Add(self.clear_button, 0, wx.EXPAND)
#run/stop
- #control_box.AddStretchSpacer()
self.run_button = common.RunStopButtonController(self, parent,
RUNNING_KEY)
control_box.Add(self.run_button, 0, wx.EXPAND)
#set sizer
@@ -135,9 +134,9 @@
self.parent.set_ref_level(
self.parent[REF_LEVEL_KEY] -
self.parent[DYNAMIC_RANGE_KEY]/10)
def _on_incr_num_lines(self, event):
- self.parent.ext_controller[self.parent.frame_rate_key] /= 2.0
+ self.parent.ext_controller[self.parent.decimation_key] += 1
def _on_decr_num_lines(self, event):
- self.parent.ext_controller[self.parent.frame_rate_key] *= 2.0
+ self.parent.ext_controller[self.parent.decimation_key] -= 1
##################################################
# Waterfall window with plotter and control panel
@@ -151,6 +150,7 @@
title,
real,
fft_size,
+ decimation_key,
baseband_freq,
sample_rate_key,
frame_rate_key,
@@ -165,6 +165,7 @@
self.ext_controller = controller
self.real = real
self.fft_size = fft_size
+ self.decimation_key = decimation_key
self.sample_rate_key = sample_rate_key
self.frame_rate_key = frame_rate_key
self.average_key = average_key
@@ -196,6 +197,7 @@
self._register_set_prop(self, RUNNING_KEY, True)
#register events
self.ext_controller.subscribe(msg_key, self.handle_msg)
+ self.ext_controller.subscribe(self.decimation_key,
self.update_grid)
self.ext_controller.subscribe(self.sample_rate_key,
self.update_grid)
self.ext_controller.subscribe(self.frame_rate_key,
self.update_grid)
self.subscribe(BASEBAND_FREQ_KEY, self.update_grid)
Modified: gnuradio/branches/features/experimental-gui/waterfallsink.py
===================================================================
--- gnuradio/branches/features/experimental-gui/waterfallsink.py
2008-08-06 20:11:53 UTC (rev 9194)
+++ gnuradio/branches/features/experimental-gui/waterfallsink.py
2008-08-06 20:12:03 UTC (rev 9195)
@@ -32,6 +32,7 @@
##################################################
SAMPLE_RATE_KEY = 'sample_rate'
FRAME_RATE_KEY = 'frame_rate'
+DECIMATION_KEY = 'decimation'
AVERAGE_KEY = 'average'
AVG_ALPHA_KEY = 'avg_alpha'
MSG_KEY = 'msg'
@@ -90,8 +91,9 @@
self.controller.publish(AVG_ALPHA_KEY, fft.avg_alpha)
self.controller.subscribe(SAMPLE_RATE_KEY, fft.set_sample_rate)
self.controller.publish(SAMPLE_RATE_KEY, fft.sample_rate)
- self.controller.subscribe(FRAME_RATE_KEY, fft._sd.set_vec_rate)
#FIXME
- self.controller.publish(FRAME_RATE_KEY, fft._sd.frame_rate)
#FIXME
+ self.controller.subscribe(DECIMATION_KEY, fft.set_decimation)
+ self.controller.publish(DECIMATION_KEY, fft.decimation)
+ self.controller.publish(FRAME_RATE_KEY, fft.frame_rate)
#start input watcher
def setter(p, k, x): # lambdas can't have assignments :(
p[k] = x
@@ -105,6 +107,7 @@
real=self.real,
fft_size=fft_size,
baseband_freq=baseband_freq,
+ decimation_key=DECIMATION_KEY,
sample_rate_key=SAMPLE_RATE_KEY,
frame_rate_key=FRAME_RATE_KEY,
dynamic_range=dynamic_range,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9195 - gnuradio/branches/features/experimental-gui,
jblum <=