[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8794 - gnuradio/branches/developers/jblum/gr-wxglgui/
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8794 - gnuradio/branches/developers/jblum/gr-wxglgui/src/python |
|
Date: |
Fri, 4 Jul 2008 13:06:03 -0600 (MDT) |
Author: jblum
Date: 2008-07-04 13:06:02 -0600 (Fri, 04 Jul 2008)
New Revision: 8794
Modified:
gnuradio/branches/developers/jblum/gr-wxglgui/src/python/constsink.py
gnuradio/branches/developers/jblum/gr-wxglgui/src/python/fftsink.py
gnuradio/branches/developers/jblum/gr-wxglgui/src/python/scopesink.py
Log:
avg alpha slider in fft
Modified: gnuradio/branches/developers/jblum/gr-wxglgui/src/python/constsink.py
===================================================================
--- gnuradio/branches/developers/jblum/gr-wxglgui/src/python/constsink.py
2008-07-04 17:44:07 UTC (rev 8793)
+++ gnuradio/branches/developers/jblum/gr-wxglgui/src/python/constsink.py
2008-07-04 19:06:02 UTC (rev 8794)
@@ -36,7 +36,7 @@
SLIDER_STEPS = 100
ALPHA_MIN, ALPHA_MAX = 0, .02
GAIN_MU_MIN, GAIN_MU_MAX = 0, .02
-DEFAULT_FRAME_RATE = 5
+DEFAULT_FRAME_RATE = 30
DEFAULT_WIN_SIZE = (500, 400)
DEFAULT_CONST_SIZE = 1024
CONST_PLOT_COLOR_SPEC = (0, 0, 1)
@@ -97,11 +97,11 @@
hbox.Add(self.omega_text_box, 0, wx.ALIGN_CENTER_VERTICAL)
control_box.AddStretchSpacer()
#run/stop
+ control_box.AddStretchSpacer()
self.run_button = wx.Button(self, -1, '', style=wx.BU_EXACTFIT)
self.run_button.Bind(wx.EVT_BUTTON, self._on_run)
control_box.Add(self.run_button, 0, wx.EXPAND)
- #end control box
- control_box.AddStretchSpacer()
+
#set sizer
self.SetSizerAndFit(control_box)
#update
@@ -139,8 +139,6 @@
parent,
size,
title,
- frame_rate,
- sample_rate,
alpha,
mu,
gain_mu,
@@ -155,7 +153,6 @@
):
#setup
self.running = True
- self.sample_rate = sample_rate
self.x_divs = 8
self.y_divs = 8
#mspk settings
@@ -307,8 +304,6 @@
parent=parent,
size=size,
title=title,
- frame_rate=frame_rate,
- sample_rate=sample_rate,
alpha=alpha,
mu=mu,
gain_mu=gain_mu,
Modified: gnuradio/branches/developers/jblum/gr-wxglgui/src/python/fftsink.py
===================================================================
--- gnuradio/branches/developers/jblum/gr-wxglgui/src/python/fftsink.py
2008-07-04 17:44:07 UTC (rev 8793)
+++ gnuradio/branches/developers/jblum/gr-wxglgui/src/python/fftsink.py
2008-07-04 19:06:02 UTC (rev 8794)
@@ -31,6 +31,7 @@
##################################################
# Constants
##################################################
+SLIDER_STEPS = 100
DEFAULT_FRAME_RATE = 30
DEFAULT_WIN_SIZE = (640, 240)
DIV_LEVELS = (1, 2, 5, 10, 20)
@@ -63,6 +64,12 @@
self.peak_hold_check_box = wx.CheckBox(parent=self,
style=wx.CHK_2STATE, label="Peak Hold")
self.peak_hold_check_box.Bind(wx.EVT_CHECKBOX,
self._on_peak_hold)
control_box.Add(self.peak_hold_check_box, 0, wx.EXPAND)
+ control_box.AddSpacer(2)
+ self.avg_alpha_label = wx.StaticText(self, -1, 'Avg Alpha:
0.00')
+ control_box.Add(self.avg_alpha_label, 0, wx.EXPAND)
+ self.avg_alpha_slider = wx.Slider(self, -1, 0, 0, SLIDER_STEPS,
style=wx.SL_HORIZONTAL)
+ self.avg_alpha_slider.Bind(wx.EVT_SCROLL, self._on_avg_alpha)
+ control_box.Add(self.avg_alpha_slider, 0, wx.EXPAND)
#radio buttons for div size
control_box.AddStretchSpacer()
@@ -95,6 +102,15 @@
#update checkboxes
self.average_check_box.SetValue(self.parent.average)
self.peak_hold_check_box.SetValue(self.parent.peak_hold)
+ #update avg alpha
+ self.avg_alpha_label.SetLabel('Avg Alpha:
%.2f'%self.parent.avg_alpha)
+
self.avg_alpha_slider.SetValue(self.parent.avg_alpha*SLIDER_STEPS)
+ if self.parent.average:
+ self.avg_alpha_label.Enable()
+ self.avg_alpha_slider.Enable()
+ else:
+ self.avg_alpha_label.Disable()
+ self.avg_alpha_slider.Disable()
#update radio buttons
try:
index = list(DIV_LEVELS).index(self.parent.y_per_div)
@@ -112,6 +128,7 @@
def _on_peak_hold(self, event):
self.parent.set_peak_hold(event.IsChecked())
def _on_incr_ref_level(self, event): self.parent.incr_ref_level()
def _on_decr_ref_level(self, event): self.parent.decr_ref_level()
+ def _on_avg_alpha(self, event):
self.parent.set_avg_alpha(float(self.avg_alpha_slider.GetValue())/SLIDER_STEPS)
##################################################
# FFT window with plotter and control panel
@@ -129,8 +146,10 @@
y_divs,
ref_level,
average,
+ avg_alpha,
peak_hold,
ext_set_average,
+ ext_set_avg_alpha,
ext_set_sample_rate,
):
#ensure y_per_div
@@ -144,8 +163,10 @@
self.y_divs = y_divs
self.ref_level = ref_level
self.average = average
+ self.avg_alpha = avg_alpha
self.peak_hold = peak_hold
self.ext_set_average = ext_set_average
+ self.ext_set_avg_alpha = ext_set_avg_alpha
self.ext_set_sample_rate = ext_set_sample_rate
self.peak_vals = []
#init panel and plot
@@ -191,6 +212,7 @@
def update(self):
#update fft block
self.ext_set_average(self.average)
+ self.ext_set_avg_alpha(self.avg_alpha)
self.ext_set_sample_rate(self.sample_rate)
#update peak hold
if not self.peak_hold: self.peak_vals = []
@@ -237,6 +259,9 @@
def set_average(self, average):
self.average = average
self.update()
+ def set_avg_alpha(self, avg_alpha):
+ self.avg_alpha = avg_alpha
+ self.update()
def set_peak_hold(self, peak_hold):
self.peak_hold = peak_hold
self.update()
@@ -309,8 +334,10 @@
y_divs=y_divs,
ref_level=ref_level,
average=average,
+ avg_alpha=avg_alpha,
peak_hold=peak_hold,
ext_set_average=fft.set_average,
+ ext_set_avg_alpha=fft.set_avg_alpha,
ext_set_sample_rate=fft.set_sample_rate,
)
#register callbacks from window for external use
@@ -319,7 +346,7 @@
self.set_peak_hold = self.win.set_peak_hold
self.set_y_per_div = self.win.set_y_per_div
self.set_ref_level = self.win.set_ref_level
- self.set_avg_alpha = fft.set_avg_alpha
+ self.set_avg_alpha = self.win.set_avg_alpha
self.set_sample_rate = self.win.set_sample_rate
#setup the input watcher
common.input_watcher(msgq, self._handle_msg)
Modified: gnuradio/branches/developers/jblum/gr-wxglgui/src/python/scopesink.py
===================================================================
--- gnuradio/branches/developers/jblum/gr-wxglgui/src/python/scopesink.py
2008-07-04 17:44:07 UTC (rev 8793)
+++ gnuradio/branches/developers/jblum/gr-wxglgui/src/python/scopesink.py
2008-07-04 19:06:02 UTC (rev 8794)
@@ -74,30 +74,27 @@
wx.Panel.__init__(self, parent, -1, style=wx.SUNKEN_BORDER)
control_box = wx.BoxSizer(wx.VERTICAL)
- #begin control box
- control_box.AddSpacer(2)
-
#trigger options
- control_box.AddSpacer(2)
+ control_box.AddStretchSpacer()
control_box.Add(common.LabelText(self, 'Trigger Options'), 0,
wx.ALIGN_CENTER)
control_box.AddSpacer(2)
#trigger mode
hbox = wx.BoxSizer(wx.HORIZONTAL)
- control_box.Add(hbox, 1, wx.EXPAND)
+ control_box.Add(hbox, 0, wx.EXPAND)
hbox.Add(wx.StaticText(self, -1, ' Channel '), 1,
wx.ALIGN_CENTER_VERTICAL)
self.trigger_channel_chooser = wx.Choice(self, -1,
choices=["Ch%d"%ch for ch in range(1, parent.num_inputs+1)])
self.trigger_channel_chooser.Bind(wx.EVT_CHOICE,
self._on_trigger_channel)
hbox.Add(self.trigger_channel_chooser, 0,
wx.ALIGN_CENTER_VERTICAL)
#trigger mode
hbox = wx.BoxSizer(wx.HORIZONTAL)
- control_box.Add(hbox, 1, wx.EXPAND)
+ control_box.Add(hbox, 0, wx.EXPAND)
hbox.Add(wx.StaticText(self, -1, ' Mode '), 1,
wx.ALIGN_CENTER_VERTICAL)
self.trigger_mode_chooser = wx.Choice(self, -1, choices=[tm[0]
for tm in TRIGGER_MODES])
self.trigger_mode_chooser.Bind(wx.EVT_CHOICE,
self._on_trigger_mode)
hbox.Add(self.trigger_mode_chooser, 0, wx.ALIGN_CENTER_VERTICAL)
#trigger level
hbox = wx.BoxSizer(wx.HORIZONTAL)
- control_box.Add(hbox, 1, wx.EXPAND)
+ control_box.Add(hbox, 0, wx.EXPAND)
hbox.Add(wx.StaticText(self, -1, ' Level '), 1,
wx.ALIGN_CENTER_VERTICAL)
self.trigger_level_chooser = wx.Choice(self, -1, choices=[tl[0]
for tl in TRIGGER_LEVELS])
self.trigger_level_chooser.Bind(wx.EVT_CHOICE,
self._on_trigger_level)
@@ -105,32 +102,32 @@
#axes options
SPACING = 15
- control_box.AddSpacer(2)
+ control_box.AddStretchSpacer()
control_box.Add(common.LabelText(self, 'Axes Options'), 0,
wx.ALIGN_CENTER)
#x axis divs
hbox = wx.BoxSizer(wx.HORIZONTAL)
- control_box.Add(hbox, 1, wx.EXPAND)
+ control_box.Add(hbox, 0, wx.EXPAND)
hbox.Add(wx.StaticText(self, -1, ' Secs/Div '), 1,
wx.ALIGN_CENTER_VERTICAL)
self.x_buttons = common.IncrDecrButtons(self,
self._on_incr_x_divs, self._on_decr_x_divs)
hbox.Add(self.x_buttons, 0, wx.ALIGN_CENTER_VERTICAL)
hbox.AddSpacer(SPACING)
#y axis divs
hbox = wx.BoxSizer(wx.HORIZONTAL)
- control_box.Add(hbox, 1, wx.EXPAND)
+ control_box.Add(hbox, 0, wx.EXPAND)
hbox.Add(wx.StaticText(self, -1, ' Units/Div '), 1,
wx.ALIGN_CENTER_VERTICAL)
self.y_buttons = common.IncrDecrButtons(self,
self._on_incr_y_divs, self._on_decr_y_divs)
hbox.Add(self.y_buttons, 0, wx.ALIGN_CENTER_VERTICAL)
hbox.AddSpacer(SPACING)
#y axis ref lvl
hbox = wx.BoxSizer(wx.HORIZONTAL)
- control_box.Add(hbox, 1, wx.EXPAND)
+ control_box.Add(hbox, 0, wx.EXPAND)
hbox.Add(wx.StaticText(self, -1, ' Y Offset '), 1,
wx.ALIGN_CENTER_VERTICAL)
self.y_off_buttons = common.IncrDecrButtons(self,
self._on_incr_y_off, self._on_decr_y_off)
hbox.Add(self.y_off_buttons, 0, wx.ALIGN_CENTER_VERTICAL)
hbox.AddSpacer(SPACING)
#misc options
- control_box.AddSpacer(2)
+ control_box.AddStretchSpacer()
control_box.Add(common.LabelText(self, 'Range Options'), 0,
wx.ALIGN_CENTER)
#ac couple check box
self.ac_couple_check_box = wx.CheckBox(parent=self,
style=wx.CHK_2STATE, label="AC Couple")
@@ -141,12 +138,11 @@
self.autorange_check_box.Bind(wx.EVT_CHECKBOX,
self._on_autorange)
control_box.Add(self.autorange_check_box, 0, wx.ALIGN_LEFT)
#Run button
+ control_box.AddStretchSpacer()
self.run_button = wx.Button(self, -1, '', style=wx.BU_EXACTFIT)
self.run_button.Bind(wx.EVT_BUTTON, self._on_run)
control_box.Add(self.run_button, 0, wx.EXPAND)
- #end control box
- control_box.AddSpacer(2)
#set sizer
self.SetSizerAndFit(control_box)
#update
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8794 - gnuradio/branches/developers/jblum/gr-wxglgui/src/python,
jblum <=