[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/10: fixed click to tune, click mouse on
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 04/10: fixed click to tune, click mouse on fft display will tune to that frequency |
Date: |
Tue, 11 Feb 2014 21:11:22 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 0c895a7198b479ec2899d58fc781f54a025192d9
Author: root <address@hidden(none)>
Date: Thu Jan 9 19:16:46 2014 -0500
fixed click to tune, click mouse on fft display will tune to that frequency
---
gr-uhd/apps/hf_explorer/hfx.py | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gr-uhd/apps/hf_explorer/hfx.py b/gr-uhd/apps/hf_explorer/hfx.py
index 10cf407..8d87b67 100755
--- a/gr-uhd/apps/hf_explorer/hfx.py
+++ b/gr-uhd/apps/hf_explorer/hfx.py
@@ -274,6 +274,7 @@ class MyFrame(wx.Frame):
baseband_freq=self.usrp_center)
c2f = blocks.complex_to_float()
+
# AM branch
self.sel_am = blocks.multiply_const_cc(0)
# the following frequencies turn out to be in radians/sample
@@ -348,7 +349,7 @@ class MyFrame(wx.Frame):
self.tb.start()
# left click to re-tune
- self.fft.win.Bind(wx.EVT_LEFT_DOWN, self.Click)
+ self.fft.win.plotter.Bind(wx.EVT_LEFT_DOWN, self.Click)
# start a timer to check for web commands
if WEB_CONTROL:
@@ -646,18 +647,9 @@ class MyFrame(wx.Frame):
if self.PLAY_FROM_USRP == False:
self.src.seek(-10000000,gr.SEEK_CUR)
- # Mouse over fft display - show frequency in tooltip
- def Mouse(self,event):
- if self.AM_mode:
- fRel = ( event.GetX() - 330. ) / 14.266666 - 7.5
- else:
- fRel = ( event.GetX() - 330. ) / 14.266666
-
self.fft.win.SetToolTip(wx.ToolTip(eng_notation.num_to_str(self.frequency +
(fRel*1e3))))
-
# Mouse clicked on fft display - change frequency
def Click(self,event):
- print "In Click"
- fRel = ( event.GetX() - 330. ) / 14.266666
+ fRel = ( event.GetX() - 340. ) / 18.125
if self.AM_mode == False:
self.frequency = self.frequency + (fRel*1e3)
else:
- [Commit-gnuradio] [gnuradio] branch master updated (19d111e -> 295ba35), git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 03/10: Fixed other issues with app - changes to fft display - still missing 'tune on click', git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 06/10: filter: added a ccc version of the pfb_arb_resampler block., git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 02/10: update README, git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 04/10: fixed click to tune, click mouse on fft display will tune to that frequency,
git <=
- [Commit-gnuradio] [gnuradio] 05/10: Merge remote-tracking branch 'cswiger/master' into hfx, git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 07/10: uhd: hf_explorer example: Added some more options for better handling of rates., git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 08/10: Merge branch 'maint', git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 10/10: filter: fixed use of volk_malloc in fft_filter kernel., git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 09/10: qtgui: in sink_c and sink_f, use volk_malloc/volk_free instead of new for buffers., git, 2014/02/11
- [Commit-gnuradio] [gnuradio] 01/10: fixing hfx.py for proper uhd support - tuning was negative of desired change, removed antenna tuner support, git, 2014/02/11