dev (#295)

Co-authored-by: Dominik Demuth <dominik.demuth@physik.tu-darmstadt.de> Reviewed-on: #295
2024-11-13 13:02:05 +00:00
parent 4108deb69a
commit 7145f9e3cd
9 changed files with 443 additions and 327 deletions
--- a/src/gui_qt/main/management.py
+++ b/src/gui_qt/main/management.py
@ -791,16 +791,27 @@ class UpperManagement(QtCore.QObject):
        _active = self.graphs[self.current_graph].active

        new_datasets = {}
+        groupby = params.pop('groupby')
+
        for sid in _active:
            data_i = self.data[sid]
-            if data_i.group not in new_datasets:
-                new_datasets[data_i.group] = [], []
-            new_x_axis, _temp = new_datasets[data_i.group]
-
            pts = data_i.points(params)
-            if pts:
-                new_x_axis.append(data_i.value)
-                _temp.append(pts)
+
+            if groupby == 'group':
+                if data_i.group not in new_datasets:
+                    new_datasets[data_i.group] = [], []
+                new_x_axis, _temp = new_datasets[data_i.group]
+                if pts:
+                    new_x_axis.append(data_i.value)
+                    _temp.append(pts)
+
+            else:
+                for (_x, _y, _yerr) in pts:
+                    if _x not in new_datasets:
+                        new_datasets[_x] = [], []
+                    new_x_axis, _temp = new_datasets[_x]
+                    new_x_axis.append(data_i.value)
+                    _temp.append([[_x, _y, _yerr]])

        key_list = []
        for label, (new_x_axis, _temp) in new_datasets.items():