diff options
author | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-04-15 03:49:04 +0000 |
---|---|---|
committer | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-04-15 03:49:04 +0000 |
commit | 322e065b19c922e2a9cc1710876e32d100453181 (patch) | |
tree | acc0c5d9643fd647d128ca4215147eef79189af3 /gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc | |
parent | ae5fa9430882f5140a3c9a9b61e4a5f7c4ed9127 (diff) |
Merging qtdevel2 branch -r10565:10849. This adds a lot of fixes and capabilities to the qtgui package. Most importantly, it allows interaction between PyQt and the C++ Qt routines in the gnuradio library.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10850 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc')
-rw-r--r-- | gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc index 21011ed687..1b66506131 100644 --- a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc +++ b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc @@ -111,8 +111,18 @@ void Waterfall3DDisplayPlot::Reset(){ _timePerFFT = 1.0; } -void Waterfall3DDisplayPlot::SetFrequencyRange(const double startFreq, const double stopFreq, const double centerFreq, const bool useCenterFrequencyFlag){ - if((stopFreq > 0) && (stopFreq > startFreq)){ +void +Waterfall3DDisplayPlot::SetFrequencyRange(const double constStartFreq, + const double constStopFreq, + const double constCenterFreq, + const bool useCenterFrequencyFlag, + const double units, const std::string &strunits) +{ + double startFreq = constStartFreq / units; + double stopFreq = constStopFreq / units; + double centerFreq = constCenterFreq / units; + + if(stopFreq > startFreq) { _startFrequency = startFreq; _stopFrequency = stopFreq; |