Skip to content
Snippets Groups Projects
Commit 11e66d84 authored by Lan Dam's avatar Lan Dam
Browse files

Merge branch 'i129_masspos_main_window_pref_list' into 'master'

Fix bug not plotting mass position on main window when preference list is selected

Closes #129

See merge request !153
parents fe26d28f d9056c22
No related branches found
No related tags found
1 merge request!153Fix bug not plotting mass position on main window when preference list is selected
Pipeline #2872 passed with stage
in 3 minutes and 18 seconds
...@@ -110,7 +110,7 @@ class MultiThreadedPlottingWidget(PlottingWidget): ...@@ -110,7 +110,7 @@ class MultiThreadedPlottingWidget(PlottingWidget):
def create_plotting_channel_processors( def create_plotting_channel_processors(
self, plotting_data: Dict, self, plotting_data: Dict,
need_db_info: bool = False, need_db_info: bool = False,
need_move_channel: bool = False is_plotting_data1: bool = False
) -> None: ) -> None:
""" """
Create a data processor for each channel data in the order of Create a data processor for each channel data in the order of
...@@ -119,10 +119,10 @@ class MultiThreadedPlottingWidget(PlottingWidget): ...@@ -119,10 +119,10 @@ class MultiThreadedPlottingWidget(PlottingWidget):
:param plotting_data: dict of data by chan_id :param plotting_data: dict of data by chan_id
:param need_db_info: flag to get db info :param need_db_info: flag to get db info
:param need_move_channel: flag to call :param is_plotting_data1: flag to tell if the plotting_data sent is
move_soh_channels_with_link_to_the_end() plotting_data1
""" """
chan_order = self.pref_order if self.pref_order \ chan_order = self.pref_order if is_plotting_data1 and self.pref_order \
else sorted(list(plotting_data.keys())) else sorted(list(plotting_data.keys()))
chan_order = replace_actual_question_chans( chan_order = replace_actual_question_chans(
chan_order, list(plotting_data.keys())) chan_order, list(plotting_data.keys()))
...@@ -155,7 +155,7 @@ class MultiThreadedPlottingWidget(PlottingWidget): ...@@ -155,7 +155,7 @@ class MultiThreadedPlottingWidget(PlottingWidget):
f"{', '.join( not_plot_chans)}") f"{', '.join( not_plot_chans)}")
self.processing_log.append((msg, LogType.WARNING)) self.processing_log.append((msg, LogType.WARNING))
if need_move_channel: if is_plotting_data1:
self.move_soh_channels_with_link_to_the_end(chan_order) self.move_soh_channels_with_link_to_the_end(chan_order)
for chan_id in chan_order: for chan_id in chan_order:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment