Merge branch 'develop' of ariadne:/data/git/pylot into develop

This commit is contained in:
Marcel Paffrath 2017-06-21 14:10:24 +02:00
commit d77abdc1d0

View File

@ -279,11 +279,11 @@ defaults = {'rootpath': {'type': str,
'WAscaling': {'type': float,
'tooltip': 'Scaling relation of Wood-Anderson amplitude [nm]',
'value': []},
'value': 1.0},
'magscaling': {'type': (float),
'tooltip': 'Scaling relation for derived local magnitude',
'value': []}
'magscaling': {'type': float,
'tooltip': 'Scaling relation for derived local magnitude [a*Ml+b]',
'value': 1.0}
}
settings_main={