diff --git a/README.md b/README.md index 90229a6..6d94030 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ See [this slidedeck](https://docs.google.com/presentation/d/1aDD0TuLVqdQ3OrO-flb ## Dependencies -**This package is build and tested on python 3.10.x** +**This package is build and tested on python 3.12.x** ### Windows @@ -28,13 +28,13 @@ pip install -r requirements.txt For other platforms then Windows the `liblsl` binary (part of the `pylsl`) is not included in the python package. Recommended approach is to use `conda` (environments) at this point. More information can be found [here](https://docs.conda.io/projects/conda/en/latest/index.html). -1. Create an `conda` environment with python 3.10 +1. Create an `conda` environment with python 3.12 2. Activate your enviroment. 3. Install the `liblsl` binary in he `conda` environment. 4. Proceed with installing the regular dependencies. ```shell -conda create --name= python=3.10 +conda create --name= python=3.12 conda activate conda install -c conda-forge liblsl pip install -r requirements.txt diff --git a/ixr_flow/gui/ixrdashboard.py b/ixr_flow/gui/ixrdashboard.py index bdf038c..5855275 100644 --- a/ixr_flow/gui/ixrdashboard.py +++ b/ixr_flow/gui/ixrdashboard.py @@ -8,7 +8,7 @@ BrainFlowPresets, DataFilter, DetrendOperations, FilterTypes, WindowOperations) from pylsl import StreamInfo, StreamOutlet, cf_double64 -from pyqtgraph.Qt import QtCore, QtGui +from pyqtgraph.Qt import QtCore, QtGui, QtWidgets from scipy.signal import welch # implement from scipy.signal import butter, filtfilt @@ -119,8 +119,8 @@ def __init__(self, board_shim: BoardShim, reference: str = 'none', display_ref: logging.info(f"'{self.outlet_transmit_spectrum.get_info().name()}' Power Metric stream started.") def run(self): - self.app = QtGui.QApplication([]) - self.win = pg.GraphicsWindow(title='IXR-flow', size=(1500, 1000)) + self.app = QtWidgets.QApplication([]) + self.win = pg.GraphicsLayoutWidget(show=True, title='IXR-flow', size=(1500, 1000)); self._init_pens() self._init_timeseries() @@ -131,7 +131,7 @@ def run(self): timer = QtCore.QTimer() timer.timeout.connect(self._update) timer.start(self.update_speed_ms) - QtGui.QApplication.instance().exec_() + QtWidgets.QApplication.instance().exec_() def set_parameters(self, calib_length: int = 600, power_length: int = 10, scale: float = 1.5, offset: float = 0.5, head_impact: float = 0.2) -> None: diff --git a/requirements.txt b/requirements.txt index 236fd84..7f7e96a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,11 @@ -brainflow==5.1.0 -pyqtgraph==0.12.4 -PyQt5==5.15.7 -scipy==1.10.0 -pylsl==1.16.0 -scikit_learn==1.1.1 -pandas==1.4.3 -pyxdf==1.16.3 -matplotlib==3.5.3 +brainflow==5.12.0 +pyqtgraph==0.13.3 +PyQt5==5.15.10 +scipy==1.12.0 +pylsl==1.16.2 +scikit_learn==1.4.0 +pandas==2.2.0 +pyxdf==1.16.5 +matplotlib==3.8.2 pynput==1.7.6 +setuptools==69.0.3 \ No newline at end of file