- Subjectboxes and plots in run experiment tab are now ordered by setup rather than subject.

Author: ThomasAkam

gui/plotting.py

@@ -295,8 +295,9 @@ def __init__(self, parent=None):
     def setup_experiment(self, experiment):
         '''Create task plotters in seperate tabs for each subject.'''
         subject_dict = experiment['subjects']
-        subjects = subject_dict.keys()
-        for subject in sorted(subjects):
+        subjects = list(experiment['subjects'].keys())
+        subjects.sort(key=lambda s: experiment['subjects'][s]['setup'])
+        for subject in subjects:
             self.subject_plots.append(Task_plot(self))
             self.subject_tabs.addTab(self.subject_plots[-1],
                 '{} : {}'.format(subject_dict[subject]['setup'], subject))

gui/run_experiment_tab.py

@@ -171,6 +171,7 @@ def setup_experiment(self, experiment):
         self.plots_button.setEnabled(False)
         # Setup subjectboxes
         self.subjects = list(experiment['subjects'].keys())
+        self.subjects.sort(key=lambda s: experiment['subjects'][s]['setup'])
         for i,subject in enumerate(self.subjects):
             self.subjectboxes.append(
                 Subjectbox('{} : {}'.format(experiment['subjects'][subject]['setup'], subject), i, self))