Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to Python 3.12 and latest packages #6

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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=<name_of_choice> python=3.10
conda create --name=<name_of_choice> python=3.12
conda activate <name_of_choise>
conda install -c conda-forge liblsl
pip install -r requirements.txt
Expand Down
8 changes: 4 additions & 4 deletions ixr_flow/gui/ixrdashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand All @@ -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:
Expand Down
19 changes: 10 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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