From eaa4849a2073d45b82035ccfb77272a57a54504f Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Wed, 31 May 2017 17:31:58 +0200 Subject: [PATCH] added network code to TuneAutopicker, small bugfix --- QtPyLoT.py | 1 + pylot/RELEASE-VERSION | 2 +- pylot/core/util/widgets.py | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index 64a562aa..84a906a4 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -1503,6 +1503,7 @@ class MainWindow(QMainWindow): self.tap.update.connect(self.update_autopicker) self.tap.figure_tabs.setCurrentIndex(0) else: + self.update_autopicker() self.tap.fill_eventbox() self.tap.show() diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 7c86a3c3..80072d08 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -7d73-dirty +cf399-dirty diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index 0c10dc0e..1b97db1a 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -1424,12 +1424,14 @@ class TuneAutopicker(QWidget): stations = [] for trace in self.data.getWFData(): station = trace.stats.station - if not station in stations: - stations.append(str(station)) + network = trace.stats.network + ns_tup = (str(network), str(station)) + if not ns_tup in stations: + stations.append(ns_tup) stations.sort() model = self.stationBox.model() - for station in stations: - item = QtGui.QStandardItem(str(station)) + for network, station in stations: + item = QtGui.QStandardItem(network+'.'+station) if station in self.get_current_event().picks: item.setBackground(self.parent._colors['ref']) model.appendRow(item) @@ -1491,7 +1493,7 @@ class TuneAutopicker(QWidget): return event.autopicks[station] def get_current_station(self): - return str(self.stationBox.currentText()) + return str(self.stationBox.currentText()).split('.')[-1] def gen_tab_widget(self, name, canvas): widget = QtGui.QWidget()