wouter/Artemis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor renaming of some utility functions

Browse Source
This commit is contained in:
alessandro90
2019-04-25 20:10:53 +02:00
parent 2904887e5f
commit 00ae41f584
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
artemis.py
View File

@@ -35,8 +35,8 @@ from themes import Theme
from utilities import (checksum_ok, from utilities import (checksum_ok,
uncheck_and_emit, uncheck_and_emit,
pop_up, pop_up,
connect_to, connect_events_to_func,
filters_ok, filters_limit,
is_undef_freq, is_undef_freq,
is_undef_band, is_undef_band,
format_numbers, format_numbers,
@@ -139,7 +139,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
self.ehf_filter_btn, self.ehf_filter_btn,
) )
connect_to( connect_events_to_func(
events_to_connect = [self.lower_freq_spinbox.valueChanged, events_to_connect = [self.lower_freq_spinbox.valueChanged,
self.upper_freq_spinbox.valueChanged, self.upper_freq_spinbox.valueChanged,
self.lower_freq_filter_unit.currentTextChanged, self.lower_freq_filter_unit.currentTextChanged,
@@ -152,7 +152,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
self.upper_freq_spinbox] self.upper_freq_spinbox]
) )
connect_to( connect_events_to_func(
events_to_connect = [self.lower_freq_spinbox.valueChanged, events_to_connect = [self.lower_freq_spinbox.valueChanged,
self.upper_freq_spinbox.valueChanged, self.upper_freq_spinbox.valueChanged,
self.lower_freq_filter_unit.currentTextChanged, self.lower_freq_filter_unit.currentTextChanged,
@@ -215,7 +215,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
# Manage bandwidth filters. # Manage bandwidth filters.
connect_to( connect_events_to_func(
events_to_connect = [self.lower_band_spinbox.valueChanged, events_to_connect = [self.lower_band_spinbox.valueChanged,
self.upper_band_spinbox.valueChanged, self.upper_band_spinbox.valueChanged,
self.lower_band_filter_unit.currentTextChanged, self.lower_band_filter_unit.currentTextChanged,
@@ -228,7 +228,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
self.upper_band_spinbox] self.upper_band_spinbox]
) )
connect_to( connect_events_to_func(
events_to_connect = [self.lower_band_spinbox.valueChanged, events_to_connect = [self.lower_band_spinbox.valueChanged,
self.upper_band_spinbox.valueChanged, self.upper_band_spinbox.valueChanged,
self.lower_band_filter_unit.currentTextChanged, self.lower_band_filter_unit.currentTextChanged,
@@ -389,7 +389,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
self.reset_acf_filters_btn.clicked.connect(self.reset_acf_filters) self.reset_acf_filters_btn.clicked.connect(self.reset_acf_filters)
self.acf_info_btn.clicked.connect(lambda : webbrowser.open(Constants.ACF_DOCS)) self.acf_info_btn.clicked.connect(lambda : webbrowser.open(Constants.ACF_DOCS))
connect_to( connect_events_to_func(
events_to_connect = [self.acf_spinbox.valueChanged, self.acf_confidence.valueChanged], events_to_connect = [self.acf_spinbox.valueChanged, self.acf_confidence.valueChanged],
fun_to_connect = self.set_acf_interval_label, fun_to_connect = self.set_acf_interval_label,
fun_args = None fun_args = None
@@ -1026,12 +1026,12 @@ class Artemis(QMainWindow, Ui_MainWindow):
lower_limit_ok = True lower_limit_ok = True
upper_limit_ok = True upper_limit_ok = True
if self.activate_low_freq_filter_btn.isChecked(): if self.activate_low_freq_filter_btn.isChecked():
if not signal_freqs[1] >= filters_ok(self.lower_freq_spinbox, if not signal_freqs[1] >= filters_limit(self.lower_freq_spinbox,
self.lower_freq_filter_unit, self.lower_freq_filter_unit,
self.lower_freq_confidence, -1): self.lower_freq_confidence, -1):
lower_limit_ok = False lower_limit_ok = False
if self.activate_up_freq_filter_btn.isChecked(): if self.activate_up_freq_filter_btn.isChecked():
if not signal_freqs[0] < filters_ok(self.upper_freq_spinbox, if not signal_freqs[0] < filters_limit(self.upper_freq_spinbox,
self.upper_freq_filter_unit, self.upper_freq_filter_unit,
self.upper_freq_confidence): self.upper_freq_confidence):
upper_limit_ok = False upper_limit_ok = False
@@ -1056,12 +1056,12 @@ class Artemis(QMainWindow, Ui_MainWindow):
lower_limit_ok = True lower_limit_ok = True
upper_limit_ok = True upper_limit_ok = True
if self.activate_low_band_filter_btn.isChecked(): if self.activate_low_band_filter_btn.isChecked():
if not signal_bands[1] >= filters_ok(self.lower_band_spinbox, if not signal_bands[1] >= filters_limit(self.lower_band_spinbox,
self.lower_band_filter_unit, self.lower_band_filter_unit,
self.lower_band_confidence, -1): self.lower_band_confidence, -1):
lower_limit_ok = False lower_limit_ok = False
if self.activate_up_band_filter_btn.isChecked(): if self.activate_up_band_filter_btn.isChecked():
if not signal_bands[0] < filters_ok(self.upper_band_spinbox, if not signal_bands[0] < filters_limit(self.upper_band_spinbox,
self.upper_band_filter_unit, self.upper_band_filter_unit,
self.upper_band_confidence): self.upper_band_confidence):
upper_limit_ok = False upper_limit_ok = False

10
utilities.py
View File

@@ -54,7 +54,7 @@ def checksum_ok(data, what):
raise raise
return code.hexdigest() == reference return code.hexdigest() == reference
def connect_to(events_to_connect, fun_to_connect, fun_args): def connect_events_to_func(events_to_connect, fun_to_connect, fun_args):
if fun_args: if fun_args:
for event in events_to_connect: for event in events_to_connect:
event.connect(partial(fun_to_connect, *fun_args)) event.connect(partial(fun_to_connect, *fun_args))
@@ -62,7 +62,7 @@ def connect_to(events_to_connect, fun_to_connect, fun_args):
for event in events_to_connect: for event in events_to_connect:
event.connect(fun_to_connect) event.connect(fun_to_connect)
def filters_ok(spinbox, filter_unit, confidence, sign = 1): def filters_limit(spinbox, filter_unit, confidence, sign = 1):
band_filter = spinbox.value() * Constants.CONVERSION_FACTORS[filter_unit.currentText()] band_filter = spinbox.value() * Constants.CONVERSION_FACTORS[filter_unit.currentText()]
return band_filter + sign * (confidence.value() * band_filter) // 100 return band_filter + sign * (confidence.value() * band_filter) // 100
@@ -76,7 +76,7 @@ def is_undef_band(current_signal):
upper_band = current_signal.at[Signal.SUP_BAND] upper_band = current_signal.at[Signal.SUP_BAND]
return lower_band == Constants.UNKNOWN or upper_band == Constants.UNKNOWN return lower_band == Constants.UNKNOWN or upper_band == Constants.UNKNOWN
def change_unit(num): def _change_unit(num):
digits = len(num) digits = len(num)
if digits < 4: if digits < 4:
return 1 return 1
@@ -89,8 +89,8 @@ def change_unit(num):
def format_numbers(lower, upper): def format_numbers(lower, upper):
units = {1: 'Hz', 1000: 'kHz', 10**6: 'MHz', 10**9: 'GHz'} units = {1: 'Hz', 1000: 'kHz', 10**6: 'MHz', 10**9: 'GHz'}
lower_factor = change_unit(lower) lower_factor = _change_unit(lower)
upper_factor = change_unit(upper) upper_factor = _change_unit(upper)
pre_lower = lower pre_lower = lower
pre_upper = upper pre_upper = upper
lower = int(lower) / lower_factor lower = int(lower) / lower_factor