IPKM/nmreval
14
2
Fork 1
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge problems

Browse Source
This commit is contained in:
Dominik Demuth 2023-09-19 12:48:12 +02:00
parent 04037d6b4d
commit c5706084bf
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui_qt/main/management.py
View File

@ -458,15 +458,13 @@ class UpperManagement(QtCore.QObject):
for pos in set_order: for pos in set_order:
set_id = list_ids[pos] set_id = list_ids[pos]
data_i = self.data[set_id]
set_params = model_p['data_parameter'][set_id]
try: try:
data_i = self.data[set_id] data_i = self.data[set_id]
except KeyError as e: except KeyError as e:
raise KeyError(f'{set_id} not found') from e raise KeyError(f'{set_id} not found') from e
try: try:
set_params = model_p['parameter'][set_id] set_params = model_p['data_parameter'][set_id]
except KeyError as e: except KeyError as e:
raise KeyError(f'No parameter found for {set_id}') from e raise KeyError(f'No parameter found for {set_id}') from e
@ -487,7 +485,7 @@ class UpperManagement(QtCore.QObject):
if fit_limits == 'none': if fit_limits == 'none':
inside = slice(None) inside = slice(None)
elif fit_limits == 'x': 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])) inside = np.where((_x >= x_lim[0]) & (_x <= x_lim[1]))
else: else:
inside = np.where((_x >= fit_limits[0]) & (_x <= fit_limits[1])) inside = np.where((_x >= fit_limits[0]) & (_x <= fit_limits[1]))