From 4571075bd910d2242ef0303b1d7405475e69a2a0 Mon Sep 17 00:00:00 2001 From: "Michal Krenek (Mikos)" Date: Thu, 27 Apr 2017 16:46:18 +0200 Subject: [PATCH] Use np.linspace() instead of np.arange() in soapy_power, rtl_power and rx_power backends --- qspectrumanalyzer/backends/rtl_power.py | 3 ++- qspectrumanalyzer/backends/rx_power.py | 3 ++- qspectrumanalyzer/backends/soapy_power.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qspectrumanalyzer/backends/rtl_power.py b/qspectrumanalyzer/backends/rtl_power.py index b00f09f..ab31bac 100644 --- a/qspectrumanalyzer/backends/rtl_power.py +++ b/qspectrumanalyzer/backends/rtl_power.py @@ -77,7 +77,8 @@ class PowerThread(BasePowerThread): step = float(line[4]) samples = float(line[5]) - x_axis = list(np.arange(start_freq + self.lnb_lo, stop_freq + self.lnb_lo, step)) + x_axis = list(np.linspace(start_freq + self.lnb_lo, stop_freq + self.lnb_lo, + round((stop_freq - start_freq) / step))) y_axis = [float(y) for y in line[6:]] if len(x_axis) != len(y_axis): print("ERROR: len(x_axis) != len(y_axis), use newer version of rtl_power!") diff --git a/qspectrumanalyzer/backends/rx_power.py b/qspectrumanalyzer/backends/rx_power.py index bfa2bff..9cea02e 100644 --- a/qspectrumanalyzer/backends/rx_power.py +++ b/qspectrumanalyzer/backends/rx_power.py @@ -82,7 +82,8 @@ class PowerThread(BasePowerThread): step = float(line[4]) samples = float(line[5]) - x_axis = list(np.arange(start_freq + self.lnb_lo, stop_freq + self.lnb_lo, step)) + x_axis = list(np.linspace(start_freq + self.lnb_lo, stop_freq + self.lnb_lo, + round((stop_freq - start_freq) / step))) y_axis = [float(y) for y in line[6:]] if len(x_axis) != len(y_axis): print("ERROR: len(x_axis) != len(y_axis)!") diff --git a/qspectrumanalyzer/backends/soapy_power.py b/qspectrumanalyzer/backends/soapy_power.py index 114bfdc..249f6b4 100644 --- a/qspectrumanalyzer/backends/soapy_power.py +++ b/qspectrumanalyzer/backends/soapy_power.py @@ -169,9 +169,10 @@ class PowerThread(BasePowerThread): step = header.step samples = header.samples - x_axis = np.arange(start_freq, stop_freq, step) + x_axis = np.linspace(start_freq, stop_freq, round((stop_freq - start_freq) / step)) if len(x_axis) != len(y_axis): print("ERROR: len(x_axis) != len(y_axis)") + return if self.min_freq is None: self.min_freq = start_freq