fixing merge problems
This commit is contained in:
parent
04037d6b4d
commit
c5706084bf
@ -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]))
|
||||
|
Loading…
Reference in New Issue
Block a user