From 15e76e4932e9501553ff54bef217f859ef4c791e Mon Sep 17 00:00:00 2001 From: marcel Date: Tue, 15 Aug 2017 15:47:59 +0200 Subject: [PATCH 1/5] [refs #229] use last item in t instead of len(t) --- pylot/core/pick/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py index c6d5b014..d84682de 100644 --- a/pylot/core/pick/utils.py +++ b/pylot/core/pick/utils.py @@ -476,7 +476,7 @@ def getsignalwin(t, t1, tsignal): ''' # get signal window - isignal, = np.where((t <= min([t1 + tsignal, len(t)])) \ + isignal, = np.where((t <= min([t1 + tsignal, t[-1]])) \ & (t >= t1)) if np.size(isignal) < 1: print("getsignalwin: Empty array isignal, check signal window!") From 9bfba65aeecda9e652058df6b024f239ec06ac29 Mon Sep 17 00:00:00 2001 From: marcel Date: Tue, 15 Aug 2017 16:15:49 +0200 Subject: [PATCH 2/5] [bugfix] station names in pgplot --- pylot/core/util/widgets.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index e7aa8c3d..7cd9d302 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -560,8 +560,9 @@ class WaveformWidgetPG(QtGui.QWidget): vb.setYRange(float(lims[0]), float(lims[1]), padding=0) def setYTickLabels(self, pos, labels): - ticks = zip(pos, labels) - minorTicks = [(0, 0) for item in labels] + pos = list(pos) + ticks = list(zip(pos, labels)) + minorTicks = [(0, 0) for _ in labels] # leftAx.tickLength = 5 # leftAx.orientation = 'right' self.getAxItem('left').setTicks([ticks, minorTicks]) From 81f375841421baa05b83444fb793a162549ffe84 Mon Sep 17 00:00:00 2001 From: marcel Date: Tue, 15 Aug 2017 16:28:38 +0200 Subject: [PATCH 3/5] [change] rearranged menu (pick para, preferences) --- QtPyLoT.py | 11 +++++++---- pylot/core/util/widgets.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index 55561bb8..4327946c 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -503,7 +503,7 @@ class MainWindow(QMainWindow): ' the complete project on grid engine.') self.auto_pick_sge.setEnabled(False) - autoPickActions = (self.auto_tune, self.auto_pick, self.compare_action) + pickActions = (self.auto_tune, self.auto_pick, self.compare_action) # pickToolBar = self.addToolBar("PickTools") # pickToolActions = (selectStation, ) @@ -525,20 +525,22 @@ class MainWindow(QMainWindow): self.openProjectAction, self.saveProjectAction, self.saveProjectAsAction, self.openEventAction, self.saveEventAction, None, - prefsEventAction, self.parameterAction, quitAction) + quitAction) self.fileMenu.aboutToShow.connect(self.updateFileMenu) self.updateFileMenu() self.editMenu = self.menuBar().addMenu('&Edit') editActions = (self.filterAction, filterEditAction, None, self.selectPAction, self.selectSAction, None, - printAction) + prefsEventAction) + #printAction) #TODO: print event? + pickMenuActions = (self.parameterAction,) self.pickMenu = self.menuBar().addMenu('&Picking') self.autoPickMenu = self.pickMenu.addMenu('Automatic picking') self.autoPickMenu.setEnabled(False) - pickActions = (self.auto_pick, self.auto_pick_local, self.auto_pick_sge) + autoPickActions = (self.auto_pick, self.auto_pick_local, self.auto_pick_sge) self.helpMenu = self.menuBar().addMenu('&Help') helpActions = (helpAction,) @@ -567,6 +569,7 @@ class MainWindow(QMainWindow): self.addActions(self.editMenu, editActions) self.addActions(self.autoPickMenu, pickActions) + self.addActions(self.pickMenu, pickMenuActions) self.addActions(self.helpMenu, helpActions) self.addActions(fileToolBar, fileToolActions) diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index 7cd9d302..b03002a9 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -2453,7 +2453,7 @@ class PylotParaBox(QtGui.QWidget): self.add_special_pick_parameters_tab() self.params_to_gui() self._toggle_advanced_settings() - self.resize(720, 1280) + self.resize(720, 860) self.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal) self.accepted.connect(self.params_from_gui) self.rejected.connect(self.params_to_gui) From 92e083770efbaafd7b3f24414f31d516f86b3c48 Mon Sep 17 00:00:00 2001 From: marcel Date: Tue, 15 Aug 2017 16:32:02 +0200 Subject: [PATCH 4/5] [bugfix] accidently swapped pick menus --- QtPyLoT.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index 4327946c..2fa8ba26 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -568,14 +568,14 @@ class MainWindow(QMainWindow): locationToolBar.setObjectName("LocationTools") self.addActions(self.editMenu, editActions) - self.addActions(self.autoPickMenu, pickActions) + self.addActions(self.autoPickMenu, autoPickActions) self.addActions(self.pickMenu, pickMenuActions) self.addActions(self.helpMenu, helpActions) self.addActions(fileToolBar, fileToolActions) self.addActions(eventToolBar, eventToolActions) self.addActions(componentToolBar, componentActions) - self.addActions(autoPickToolBar, autoPickActions) + self.addActions(autoPickToolBar, pickActions) self.addActions(locationToolBar, locationToolActions) self.eventLabel = QLabel() From ff6f2ed2d93f6832ca1b1c870c5fc3826d8bb9b3 Mon Sep 17 00:00:00 2001 From: marcel Date: Tue, 15 Aug 2017 16:36:14 +0200 Subject: [PATCH 5/5] [minor] rearrange menu items --- QtPyLoT.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index 2fa8ba26..9f1cd7a4 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -353,7 +353,7 @@ class MainWindow(QMainWindow): # self.createNewEvent, # QKeySequence.New, newIcon, # "Create a new event.") - self.openEventAction = self.createAction(self, "Load event ...", + self.openEventAction = self.createAction(self, "Load event information...", self.load_data, "Ctrl+M", openEventIcon, @@ -521,9 +521,10 @@ class MainWindow(QMainWindow): # add top menu self.fileMenu = self.menuBar().addMenu('&File') - self.fileMenuActions = (self.newProjectAction, self.addEventDataAction, + self.fileMenuActions = (self.newProjectAction, self.openProjectAction, self.saveProjectAction, - self.saveProjectAsAction, + self.saveProjectAsAction, None, + self.addEventDataAction, self.openEventAction, self.saveEventAction, None, quitAction) self.fileMenu.aboutToShow.connect(self.updateFileMenu) @@ -545,12 +546,13 @@ class MainWindow(QMainWindow): self.helpMenu = self.menuBar().addMenu('&Help') helpActions = (helpAction,) - fileToolActions = (self.newProjectAction, self.addEventDataAction, + fileToolActions = (self.newProjectAction, self.openProjectAction, self.saveProjectAction, self.saveProjectAsAction) - eventToolActions = (self.openEventAction, self.openEventsAutoAction, + eventToolActions = (self.addEventDataAction, + self.openEventAction, self.openEventsAutoAction, self.saveEventAction, self.loadlocationaction, self.loadpilotevent)