diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-14 15:12:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-14 15:12:05 -0700 |
| commit | 81dd35d7e8d75e86f4dfa49a05353dd166d7dd2f (patch) | |
| tree | 751be7c3e4f2787a1ab7b00ca7516d585a06a20c | |
| parent | 811bee8c54bdca5c53c2ccbc6ef6d1bbca55eaae (diff) | |
| parent | 7162a7ed65a0d03cb147cbe95f2a47fe68f87ab8 (diff) | |
Merge branch 'maint'
| -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 | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de86d8a002..4de54d674a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,16 +223,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 356ec1217b..1ed9d6cacb 100644 --- a/gr-fft/python/fft/logpwrfft.py +++ b/gr-fft/python/fft/logpwrfft.py @@ -69,8 +69,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 b/gr-qtgui/python/qtgui/range.py index ca42bf71f7..f60d6919bf 100755 --- a/gr-qtgui/python/qtgui/range.py +++ b/gr-qtgui/python/qtgui/range.py @@ -182,11 +182,11 @@ class RangeWidget(QtGui.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) |