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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Marcel Paffrath 2017-05-18 11:42:42 +02:00
commit 0a911154ca
3 changed files with 3195 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
QtPyLoT.py
View File

@ -248,8 +248,10 @@ class MainWindow(QMainWindow):
n_icon.addPixmap(QPixmap(':/icons/key_N.png')) n_icon.addPixmap(QPixmap(':/icons/key_N.png'))
e_icon = QIcon() e_icon = QIcon()
e_icon.addPixmap(QPixmap(':/icons/key_E.png')) e_icon.addPixmap(QPixmap(':/icons/key_E.png'))
auto_icon = QIcon(':/icons/autopick_button.png') autotune_icon = QIcon()
auto_icon.addPixmap(QPixmap(':/icons/autopick_button.png')) autotune_icon.addPixmap(QPixmap(':/icons/autopick_button.png'))
autopylot_icon = QIcon()
autopylot_icon.addPixmap(QPixmap(':/icons/autopylot_button'))
locate_icon = QIcon() locate_icon = QIcon()
locate_icon.addPixmap(QPixmap(':/icons/locate_button.png')) locate_icon.addPixmap(QPixmap(':/icons/locate_button.png'))
compare_icon = QIcon() compare_icon = QIcon()
@ -423,14 +425,20 @@ class MainWindow(QMainWindow):
componentToolBar.setObjectName("PhaseTools") componentToolBar.setObjectName("PhaseTools")
self.addActions(componentToolBar, componentActions) self.addActions(componentToolBar, componentActions)
self.auto_tune = self.createAction(parent=self, text='autoPick', self.auto_tune = self.createAction(parent=self, text='autoTune',
slot=self.tune_autopicker, shortcut='Alt+Ctrl+A', slot=self.tune_autopicker, shortcut='Alt+Ctrl+A',
icon=auto_icon, tip='Tune autopicking algorithm.') icon=autotune_icon, tip='Tune autopicking algorithm.')
self.auto_tune.setEnabled(False) self.auto_tune.setEnabled(False)
self.auto_pick = self.createAction(parent=self, text='autoPick',
slot=self.autoPick, shortcut='Alt+Ctrl+A',
icon=autopylot_icon, tip='Automatically pick'
' the displayed waveforms.')
self.auto_pick.setEnabled(False)
autoPickToolBar = self.addToolBar("autoPyLoT") autoPickToolBar = self.addToolBar("autoPyLoT")
autoPickActions = (self.auto_tune, self.compare_action) autoPickActions = (self.auto_tune, self.auto_pick, self.compare_action)
self.addActions(autoPickToolBar, autoPickActions) self.addActions(autoPickToolBar, autoPickActions)
# pickToolBar = self.addToolBar("PickTools") # pickToolBar = self.addToolBar("PickTools")
@ -982,6 +990,7 @@ class MainWindow(QMainWindow):
self.loadlocationaction.setEnabled(True) self.loadlocationaction.setEnabled(True)
self.saveProjectAction.setEnabled(True) self.saveProjectAction.setEnabled(True)
self.auto_tune.setEnabled(True) self.auto_tune.setEnabled(True)
self.auto_pick.setEnabled(True)
self.z_action.setEnabled(True) self.z_action.setEnabled(True)
self.e_action.setEnabled(True) self.e_action.setEnabled(True)
self.n_action.setEnabled(True) self.n_action.setEnabled(True)
@ -1005,6 +1014,7 @@ class MainWindow(QMainWindow):
self.loadlocationaction.setEnabled(False) self.loadlocationaction.setEnabled(False)
self.saveProjectAction.setEnabled(False) self.saveProjectAction.setEnabled(False)
self.auto_tune.setEnabled(False) self.auto_tune.setEnabled(False)
self.auto_pick.setEnabled(False)
self.z_action.setEnabled(False) self.z_action.setEnabled(False)
self.e_action.setEnabled(False) self.e_action.setEnabled(False)
self.n_action.setEnabled(False) self.n_action.setEnabled(False)

1
icons.qrc
View File

@ -5,6 +5,7 @@
<file>icons/pylot.png</file> <file>icons/pylot.png</file>
<file>icons/manupicsicon.png</file> <file>icons/manupicsicon.png</file>
<file>icons/autopicsicon.png</file> <file>icons/autopicsicon.png</file>
<file>icons/autopylot_button.png</file>
<file>icons/manupicksicon_small.png</file> <file>icons/manupicksicon_small.png</file>
<file>icons/autopicksicon_small.png</file> <file>icons/autopicksicon_small.png</file>
<file>icons/autopick_button.png</file> <file>icons/autopick_button.png</file>

3212
icons_rc.py
View File

File diff suppressed because it is too large Load Diff