Merging qtdevel2 branch -r10565:10849. This adds a lot of fixes and capabilities...

[debian/gnuradio] / gr-qtgui / src / lib / Waterfall3DDisplayPlot.cc

diff --git a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc
index 21011ed68756bf281b51498350de7baacbab4bcd..1b6650613190b827e1a9b38762d08fc98311fd8c 100644 (file)
--- 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;