From 87bd46b5358a69ef66dbf7b2cd7d4a20b5aefefd Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 29 May 2019 10:36:37 +0200 Subject: [PATCH 1/3] [bugfix] Exception had no attribute message --- pylot/core/io/phases.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylot/core/io/phases.py b/pylot/core/io/phases.py index e7cdba52..c8904a7f 100644 --- a/pylot/core/io/phases.py +++ b/pylot/core/io/phases.py @@ -327,7 +327,7 @@ def picks_from_picksdict(picks, creation_info=None): filter_id = phase['filteroptions'] filter_id = transformFilterString4Export(filter_id) except KeyError as e: - warnings.warn(e.message, RuntimeWarning) + warnings.warn(str(e), RuntimeWarning) filter_id = '' pick.filter_id = filter_id try: From fdcd35186fd150cb1431fc27dd770b3413423a16 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 29 May 2019 10:36:52 +0200 Subject: [PATCH 2/3] [add] $NSLOTS variable to autopylot shell script --- autopylot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autopylot.sh b/autopylot.sh index 727e8c93..3b49b59c 100644 --- a/autopylot.sh +++ b/autopylot.sh @@ -1 +1 @@ -python ./autoPyLoT.py -i /home/marcel/.pylot/pylot_global.in -dmt processed -c 80 +python ./autoPyLoT.py -i /home/marcel/.pylot/pylot_alparray_mantle.in -dmt processed -c $NSLOTS From 3ccf826f2594a5c0ea9f5e8ae21e0ff151a5cb81 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 29 May 2019 10:37:16 +0200 Subject: [PATCH 3/3] [new] FileExtensionDialog for load-picks (e.g. _correlatex.xml) --- PyLoT.py | 8 ++++++-- pylot/core/util/widgets.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/PyLoT.py b/PyLoT.py index 19b0a9a9..fd64d3e4 100755 --- a/PyLoT.py +++ b/PyLoT.py @@ -79,7 +79,7 @@ from pylot.core.io.location import create_creation_info, create_event from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg, \ PylotCanvas, WaveformWidgetPG, PropertiesDlg, HelpForm, createAction, PickDlg, \ ComparisonWidget, TuneAutopicker, PylotParaBox, AutoPickDlg, CanvasWidget, AutoPickWidget, \ - CompareEventsWidget, ProgressBarWidget, AddMetadataWidget + CompareEventsWidget, ProgressBarWidget, AddMetadataWidget, FileExtensionDialog from pylot.core.util.array_map import Array_map from pylot.core.util.structure import DATASTRUCTURE from pylot.core.util.thread import Thread, Worker @@ -941,7 +941,11 @@ class MainWindow(QMainWindow): return refresh = False events = self.project.eventlist - fext = '.xml' + fed = FileExtensionDialog() + if not fed.exec_(): + return + fext = fed.file_extension.text() + #fext = '.xml' for event in events: path = event.path eventname = path.split('/')[-1] # or event.pylot_id diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index bf4bb4ae..28b09c6b 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -1489,6 +1489,39 @@ class PylotCanvas(FigureCanvas): self.draw() +class FileExtensionDialog(QtGui.QDialog): + def __init__(self, parent=None, default_extension='.xml'): + super(FileExtensionDialog, self).__init__(parent) + self.default_extension = default_extension + self.setButtons() + self.connectSignals() + self.setupUi() + + def setupUi(self): + self.main_layout = QtGui.QVBoxLayout() + self.sub_layout = QtGui.QHBoxLayout() + # + self.setLayout(self.main_layout) + self.textLabel = QtGui.QLabel('Specify file extension: ') + self.file_extension = QtGui.QLineEdit(self.default_extension) + + self.sub_layout.addWidget(self.textLabel) + self.sub_layout.addWidget(self.file_extension) + + self.main_layout.addLayout(self.sub_layout) + self.main_layout.addWidget(self._buttonbox) + + def setButtons(self): + self._buttonbox = QDialogButtonBox(QDialogButtonBox.Ok | + QDialogButtonBox.Cancel) + + def connectSignals(self): + self._buttonbox.accepted.connect(self.accept) + self._buttonbox.rejected.connect(self.reject) + + + + class PhaseDefaults(QtGui.QDialog): def __init__(self, parent=None, nrow=10, phase_defaults=['P', 'S'],