Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
This commit is contained in:
commit
abfb8c86e7
@ -438,6 +438,9 @@ class WaveformWidget(FigureCanvas):
|
|||||||
|
|
||||||
settings = QSettings()
|
settings = QSettings()
|
||||||
compclass = settings.value('compclass')
|
compclass = settings.value('compclass')
|
||||||
|
if not compclass:
|
||||||
|
print('Warning: No settings for channel components found. Using default')
|
||||||
|
compclass = SetChannelComponents()
|
||||||
|
|
||||||
if not component == '*':
|
if not component == '*':
|
||||||
alter_comp = compclass.getCompPosition(component)
|
alter_comp = compclass.getCompPosition(component)
|
||||||
@ -2165,6 +2168,10 @@ class PropertiesDlg(QDialog):
|
|||||||
def setValues(tabValues):
|
def setValues(tabValues):
|
||||||
settings = QSettings()
|
settings = QSettings()
|
||||||
compclass = settings.value('compclass')
|
compclass = settings.value('compclass')
|
||||||
|
if not compclass:
|
||||||
|
print('Warning: No settings for channel components found. Using default')
|
||||||
|
compclass = SetChannelComponents()
|
||||||
|
|
||||||
for setting, value in tabValues.items():
|
for setting, value in tabValues.items():
|
||||||
settings.setValue(setting, value)
|
settings.setValue(setting, value)
|
||||||
if value is not None:
|
if value is not None:
|
||||||
|
Loading…
Reference in New Issue
Block a user