228-229-index-problems (#230)
All checks were successful
Build AppImage / Explore-Gitea-Actions (push) Successful in 1m34s
All checks were successful
Build AppImage / Explore-Gitea-Actions (push) Successful in 1m34s
bugfixes: closes #228, closes #229
This commit is contained in:
parent
813e18a744
commit
7161a17348
@ -12,10 +12,10 @@ class QSmooth(QtWidgets.QDialog, Ui_SmoothDialog):
|
||||
|
||||
@QtCore.pyqtSlot(int, name='on_comboBox_currentIndexChanged')
|
||||
def change_mode(self, idx: int):
|
||||
if idx == 2:
|
||||
if idx == 1:
|
||||
self.widget.show()
|
||||
self.widget_2.hide()
|
||||
elif idx == 3:
|
||||
elif idx == 2:
|
||||
self.widget.show()
|
||||
self.widget_2.show()
|
||||
else:
|
||||
@ -29,12 +29,24 @@ class QSmooth(QtWidgets.QDialog, Ui_SmoothDialog):
|
||||
idx = self.comboBox.currentIndex()
|
||||
|
||||
# this order must match the combobox
|
||||
para['mode'] = ['mean', 'savgol', 'loess', 'median', 'std', 'var', 'max', 'min', 'sum'][idx]
|
||||
para['mode'] = [
|
||||
'mean',
|
||||
'savgol',
|
||||
'loess',
|
||||
'median',
|
||||
'std',
|
||||
'var',
|
||||
'max',
|
||||
'min',
|
||||
'sum',
|
||||
][idx]
|
||||
|
||||
if idx == 2:
|
||||
# Savitzky-Golay needs also polynomial degree
|
||||
if idx == 1:
|
||||
para['deg'] = self.polynom_spinBox.value()
|
||||
|
||||
if idx == 3:
|
||||
# LOESS needs also polynomial degree and number of iterations
|
||||
if idx == 2:
|
||||
para['deg'] = self.polynom_spinBox.value()
|
||||
para['it'] = self.iter_spinBox.value()
|
||||
|
||||
|
@ -183,7 +183,13 @@ class AsciiReader:
|
||||
single_len = 2
|
||||
stepsize = 2
|
||||
|
||||
cls = {'points': Points, 'fid': FID, 'spectrum': Spectrum, 'bds': BDS, 'dsc': DSC}[mode]
|
||||
cls = {
|
||||
'points': Points,
|
||||
'fid': FID,
|
||||
'spectrum': Spectrum,
|
||||
'bds': BDS,
|
||||
'dsc': DSC,
|
||||
}[mode]
|
||||
|
||||
for j in range(1, num_y+1, stepsize):
|
||||
if col_names is not None:
|
||||
@ -191,7 +197,7 @@ class AsciiReader:
|
||||
kwargs['name'] = col_names[j-1]
|
||||
elif num_y > single_len:
|
||||
# more than one axis, append column number
|
||||
kwargs['name'] = filename + '_' + str(y[j-1])
|
||||
kwargs['name'] = f'{filename}_{y[j-1]+1}'
|
||||
|
||||
if j+num_y < raw_data.shape[2]:
|
||||
kwargs['y_err'] = raw_data[i, :, j+num_y]
|
||||
|
Loading…
Reference in New Issue
Block a user