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.

Sign up for GitHub

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

Jump to bottom

changes adapt pyqtgraph #125

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

changes adapt pyqtgraph #125

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b97f15f
changes adapt pyqtgraph
annaxu96 Dec 19, 2023
0056aa0
forgot to add actual changes
annaxu96 Dec 19, 2023
5c192a1
Merge branch 'master' of https://github.com/PhysioLabXR/PhysioLabXR i…
ApocalyVec Dec 19, 2023
0e2200f
move PhysioLabXR.py to physiolabxr folder
ApocalyVec Dec 19, 2023
16dacfd
change channel number of LSLExampleOutlet.py
ApocalyVec Dec 19, 2023
b15caa5
update requirements pyqtgraph to @wutwasthat's fork
ApocalyVec Dec 19, 2023
98e4cdc
fix issue with creating/editing groups
ApocalyVec Dec 20, 2023
19aeec6
fix issue with changing channel names
ApocalyVec Dec 20, 2023
180b53c
Merge branch 'master' of https://github.com/PhysioLabXR/PhysioLabXR i…
ApocalyVec Jan 26, 2024
bfb993f
rename visualization test
ApocalyVec Feb 7, 2024
a31d897
remove deprecated files, add toml to requirements
ApocalyVec Feb 7, 2024
b3adb8a
shortcuts
annaxu96 Feb 29, 2024
c698661
merge
annaxu96 Feb 29, 2024
d06188c
remove prints
annaxu96 Feb 29, 2024
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
5 changes: 3 additions & 2 deletions physiolabxr/examples/WriteYourOwnDataSourceExamples/LSLExampleOutlet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

# create a new stream info and outlet

stream_name = 'python_lsl_my_stream_name'
stream_name = 'stream'
stream_type = 'LSL'

n_channels = 8
# using the local_clock() to track elapsed time
Expand All @@ -14,7 +15,7 @@
# set the sampling rate to 100 Hz
nominal_sampling_rate = 100

info = StreamInfo('stream_name', 'my_stream_type', n_channels, nominal_sampling_rate, 'float32',
info = StreamInfo(stream_name, stream_type, n_channels, nominal_sampling_rate, 'float32',
'my_stream_id')
outlet = StreamOutlet(info)

Expand Down
53 changes: 33 additions & 20 deletions physiolabxr/ui/GroupPlotWidget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,27 @@ def init_line_chart(self):
distinct_colors = get_distinct_colors(len(channel_indices))
self.legends = self.linechart_widget.addLegend()
# self.linechart_widget.enableAutoRange(enable=False)
for channel_index_in_group, (channel_index, channel_name) in enumerate(
zip(channel_indices, self.channel_names)):
is_channel_shown = is_channels_shown[channel_index_in_group]
channel_plot_item = self.linechart_widget.plot([], [], pen=pg.mkPen(color=distinct_colors[channel_index_in_group]), name=channel_name)
self.channel_index_channel_dict[int(channel_index)] = channel_plot_item
if not is_channel_shown:
channel_plot_item.hide() # TODO does disable do what it should do: uncheck from the plots
downsample_method = 'mean' if self.sampling_rate > AppConfigs().downsample_method_mean_sr_threshold else 'subsample'
channel_plot_item.setDownsampling(auto=True, method=downsample_method)
channel_plot_item.setClipToView(True)
channel_plot_item.setSkipFiniteCheck(True)
self.channel_plot_item_dict[channel_name] = channel_plot_item
pens = []
names = []
for channel_index_in_group, (channel_index, channel_name) in enumerate(zip(channel_indices, self.channel_names)):
# is_channel_shown = is_channels_shown[channel_index_in_group]
pens.append(pg.mkPen(color=distinct_colors[channel_index_in_group]))
names.append(channel_name)
# channel_plot_item = self.linechart_widget.plot([], [], pen=pg.mkPen(color=distinct_colors[channel_index_in_group]), name=channel_name)
# self.channel_index_channel_dict[int(channel_index)] = channel_plot_item
# if not is_channel_shown:
# channel_plot_item.hide() # TODO does disable do what it should do: uncheck from the plots
# downsample_method = 'mean' if self.sampling_rate > AppConfigs().downsample_method_mean_sr_threshold else 'subsample'
# channel_plot_item.setDownsampling(auto=True, method=downsample_method)
# channel_plot_item.setClipToView(True)
# channel_plot_item.setSkipFiniteCheck(True)
# self.channel_plot_item_dict[channel_name] = channel_plot_item
group_plot_item = self.linechart_widget.plot([], [], pen=pens, name=names)
downsample_method = 'mean' if self.sampling_rate > AppConfigs().downsample_method_mean_sr_threshold else 'subsample'
group_plot_item.setDownsampling(auto=True, method=downsample_method)
# channel_plot_item.setClipToView(True)
group_plot_item.setSkipFiniteCheck(True)
# self.channel_plot_item_dict[channel_name] = channel_plot_item

def init_image(self):
self.plot_widget = pg.PlotWidget()
Expand Down Expand Up @@ -193,12 +202,17 @@ def plot_data(self, data):
# if line_chat_config.channels_constant_offset!=0:
# data = data +


time_vector = np.linspace(0., duration, data.shape[1])
for index_in_group, channel_index in enumerate(channel_indices):
plot_data_item = self.linechart_widget.plotItem.curves[index_in_group]
if plot_data_item.isVisible():
plot_data_item.setData(time_vector, data[channel_index, :]+linechart_config.channels_constant_offset*index_in_group)

y_vals = data[channel_indices]
channel_offsets = np.arange(y_vals.shape[0]) * linechart_config.channels_constant_offset
y_vals = y_vals + channel_offsets.reshape(-1, 1)
self.linechart_widget.plotItem.curves[0].setData(time_vector, y_vals)
# plot_data_item = self.linechart_widget.plotItem.curves[index_in_group]
# if plot_data_item.isVisible():
# print('plotting channel', channel_index, 'in group', self.group_name)
# print(time_vector.shape, data[channel_index, :].shape)
# plot_data_item.setData(time_vector, data[channel_index, :]+linechart_config.channels_constant_offset*index_in_group)

elif selected_plot_format == 1 and get_group_image_valid(self.stream_name, self.group_name):
image_config = get_group_image_config(self.stream_name, self.group_name)
Expand Down Expand Up @@ -277,9 +291,8 @@ def change_group_name(self, new_group_name):

def change_channel_name(self, new_ch_name, old_ch_name, lsl_index):
# change_plot_label(self.linechart_widget, self.channel_plot_item_dict[old_ch_name], new_ch_name)
self.channel_plot_item_dict[old_ch_name].setData(name=new_ch_name)
self.channel_plot_item_dict[new_ch_name] = self.channel_plot_item_dict.pop(old_ch_name)

# self.channel_plot_item_dict[old_ch_name].setData(name=new_ch_name)
# self.channel_plot_item_dict[new_ch_name] = self.channel_plot_item_dict.pop(old_ch_name)
# self.channel_plot_item_dict[old_ch_name].legend.setText(new_ch_name)
channel_indices = get_group_channel_indices(self.stream_name, self.group_name)
index_in_group = channel_indices.index(lsl_index)
Expand Down
2 changes: 1 addition & 1 deletion requirements.dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pyserial
pylsl
scikit-learn
scipy~=1.11.0
pyqtgraph
git+https://github.com/wutwasthat/pyqtgraph.git@physio
pyxdf
pyscreeze
opencv-python
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pyserial
pylsl
scikit-learn
scipy~=1.11.0
pyqtgraph
git+https://github.com/wutwasthat/pyqtgraph.git@physio
pyxdf
pyscreeze
opencv-python
Expand Down