marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[merge] manual merging to new function structure (widget insertion with position)

Browse Source
This commit is contained in:
Marcel Paffrath 2017-06-21 13:28:44 +02:00
commit c10639b49c
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pylot/core/io/default_parameters.py
View File

@ -277,9 +277,13 @@ defaults = {'rootpath': {'type': str,
'tooltip': 'maximum allowed deviation from Wadati-diagram', 'tooltip': 'maximum allowed deviation from Wadati-diagram',
'value': 1.0}, 'value': 1.0},
'localMag': {'type': float, 'WAscaling': {'type': float,
'tooltip': 'maximum allowed deviation from Wadati-diagram', 'tooltip': 'Scaling relation of Wood-Anderson amplitude [nm]',
'value': 1.0} 'value': []},
'magscaling': {'type': (float),
'tooltip': 'Scaling relation for derived local magnitude',
'value': []}
} }
settings_main={ settings_main={
@ -301,8 +305,10 @@ settings_main={
'smoment':[ 'smoment':[
'vp', 'vp',
'rho', 'rho',
'Qp', 'Qp'],
'localMag'], 'localmag':[
'WAscaling',
'magscaling'],
'pick':[ 'pick':[
'extent', 'extent',
'pstart', 'pstart',

4
pylot/core/util/widgets.py
View File

@ -2118,8 +2118,10 @@ class AutoPickParaBox(QtGui.QWidget):
self.parameter.get_main_para_names()['nlloc'], 1) self.parameter.get_main_para_names()['nlloc'], 1)
self.add_to_layout(self._main_layout, 'Seismic Moment', self.add_to_layout(self._main_layout, 'Seismic Moment',
self.parameter.get_main_para_names()['smoment'], 2) self.parameter.get_main_para_names()['smoment'], 2)
self.add_to_layout(self._main_layout, 'Local Magnitude',
self.parameter.get_main_para_names()['localmag'], 3)
self.add_to_layout(self._main_layout, 'Common Settings Characteristic Function', self.add_to_layout(self._main_layout, 'Common Settings Characteristic Function',
self.parameter.get_main_para_names()['pick'], 3) self.parameter.get_main_para_names()['pick'], 4)
self.add_tab(self._main_layout, 'Main Settings') self.add_tab(self._main_layout, 'Main Settings')
def add_special_pick_parameters_tab(self): def add_special_pick_parameters_tab(self):