From c5706084bfa2ff9b816739c2dcf74dc8822abdc2 Mon Sep 17 00:00:00 2001 From: Dominik Demuth Date: Tue, 19 Sep 2023 12:48:12 +0200 Subject: [PATCH] fixing merge problems --- src/gui_qt/main/management.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui_qt/main/management.py b/src/gui_qt/main/management.py index db28c00..ca5b065 100644 --- a/src/gui_qt/main/management.py +++ b/src/gui_qt/main/management.py @@ -458,15 +458,13 @@ class UpperManagement(QtCore.QObject): for pos in set_order: set_id = list_ids[pos] - data_i = self.data[set_id] - set_params = model_p['data_parameter'][set_id] try: data_i = self.data[set_id] except KeyError as e: raise KeyError(f'{set_id} not found') from e try: - set_params = model_p['parameter'][set_id] + set_params = model_p['data_parameter'][set_id] except KeyError as e: raise KeyError(f'No parameter found for {set_id}') from e @@ -487,7 +485,7 @@ class UpperManagement(QtCore.QObject): if fit_limits == 'none': inside = slice(None) elif fit_limits == 'x': - x_lim, _ = self.graphs[self.current_graph].range + x_lim, _ = self.graphs[self.current_graph].ranges inside = np.where((_x >= x_lim[0]) & (_x <= x_lim[1])) else: inside = np.where((_x >= fit_limits[0]) & (_x <= fit_limits[1]))