diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-14 15:15:57 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-14 15:15:57 -0700 |
| commit | 7f3bc9cf41bae6c5ddccf4e0f1ce225458fa5fe8 (patch) | |
| tree | 199326f0678453247ea573e88e2e1fbc82caf3c1 | |
| parent | 5869dba3e8a9cefc1203ec9037e01e95a847f7f0 (diff) | |
| parent | b2a280a9ad4ad13f958fc2e09e29f8afe48b0473 (diff) | |
Merge branch 'next' into python3
Conflicts:
gr-fft/python/fft/logpwrfft.py
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gr-fft/python/fft/logpwrfft.py | 4 | ||||
| -rwxr-xr-x | gr-qtgui/python/qtgui/range.py.cmakein | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cfe37297e..98ad5ec3b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,16 +222,16 @@ IF(MSVC) IF(MSVC90) #Visual Studio 9 SET(cmake_c_compiler_version "Microsoft Visual Studio 9.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 9.0") - ELSE(MSVC10) #Visual Studio 10 + ELSEIF(MSVC10) #Visual Studio 10 SET(cmake_c_compiler_version "Microsoft Visual Studio 10.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 10.0") - ELSE(MSVC11) #Visual Studio 11 + ELSEIF(MSVC11) #Visual Studio 11 SET(cmake_c_compiler_version "Microsoft Visual Studio 11.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 11.0") - ELSE(MSVC12) #Visual Studio 12 + ELSEIF(MSVC12) #Visual Studio 12 SET(cmake_c_compiler_version "Microsoft Visual Studio 12.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 12.0") - ELSE(MSVC14) #Visual Studio 14 + ELSEIF(MSVC14) #Visual Studio 14 SET(cmake_c_compiler_version "Microsoft Visual Studio 14.0") SET(cmake_cxx_compiler_version "Microsoft Visual Studio 14.0") ENDIF() diff --git a/gr-fft/python/fft/logpwrfft.py b/gr-fft/python/fft/logpwrfft.py index ee424f2f84..3c568b67e4 100644 --- a/gr-fft/python/fft/logpwrfft.py +++ b/gr-fft/python/fft/logpwrfft.py @@ -71,8 +71,8 @@ class _logpwrfft_base(gr.hier_block2): self._avg = filter.single_pole_iir_filter_ff(1.0, fft_size) self._log = blocks.nlog10_ff(10, fft_size, -20*math.log10(fft_size) # Adjust for number of bins - -10*math.log10(window_power / fft_size) # Adjust for windowing loss - -20*math.log10(ref_scale / 2)) # Adjust for reference scale + -10*math.log10(float(window_power) / fft_size) # Adjust for windowing loss + -20*math.log10(float(ref_scale) / 2)) # Adjust for reference scale self.connect(self, self._sd, fft, c2magsq, self._avg, self._log, self) self._average = average diff --git a/gr-qtgui/python/qtgui/range.py.cmakein b/gr-qtgui/python/qtgui/range.py.cmakein index 00db509762..9ed7706195 100755 --- a/gr-qtgui/python/qtgui/range.py.cmakein +++ b/gr-qtgui/python/qtgui/range.py.cmakein @@ -182,11 +182,11 @@ class RangeWidget(QtWidgets.QWidget): self.rangeType = rangeType # Setup the counter + self.setDecimals(ranges.precision) self.setRange(ranges.min, ranges.max) self.setValue(ranges.default) self.setSingleStep(ranges.step) self.setKeyboardTracking(False) - self.setDecimals(ranges.precision) # The counter already handles floats and can be connected directly. self.valueChanged.connect(self.changed) |