From 3680178129161e0e89d279d661445fdeb375f240 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Sat, 6 Mar 2021 11:04:08 +0100 Subject: [PATCH] [fixes] --- blipblop/constants.py | 2 -- blipblop/util/results.py | 9 +++++---- setup.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/blipblop/constants.py b/blipblop/constants.py index 423149f..624d8ca 100644 --- a/blipblop/constants.py +++ b/blipblop/constants.py @@ -31,8 +31,6 @@ for snd in SNDS_PATHS: def get_sound(name): if name in SNDS_DICT.keys(): - print(name) - print(SNDS_DICT[name]) return QMediaContent(QUrl.fromLocalFile(os.path.abspath(SNDS_DICT[name]))) else: print("Sound %s not found!" % name) diff --git a/blipblop/util/results.py b/blipblop/util/results.py index 6f08aee..9ca9731 100644 --- a/blipblop/util/results.py +++ b/blipblop/util/results.py @@ -12,6 +12,10 @@ class MeasurementResults(): self._reaction_times.append(reaction_time) @property + def results(self): + return self._reaction_times + + @results.setter def results(self, reaction_times): self._reaction_times = reaction_times @@ -23,10 +27,7 @@ class MeasurementResults(): def starttime(self): return self._task_timestamp - @property + @starttime.setter def starttime(self, starttime): self._task_timestamp = starttime - @property - def results(self): - return self._reaction_times diff --git a/setup.py b/setup.py index c4713c5..e5874c9 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ packages = [ "blipblop", ] -install_req = ["PyQt5", "numpy"] +install_req = ["PyQt5", "json", "os", "glob"] data_files = [("icons", glob.glob(os.path.join("icons", "*.png"))), ("icons", glob.glob(os.path.join("icons", "*.ic*"))),