From 1b512a0864e2bfe427c390dc39057a2865d31074 Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Tue, 20 Jun 2017 16:23:54 +0200 Subject: [PATCH] [closes #207, closes #208] when supressing user prompt, applyEVTData to data object was accidently removed --- QtPyLoT.py | 12 ++++++------ pylot/RELEASE-VERSION | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index ceab88ef..8e558b5c 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -943,9 +943,9 @@ class MainWindow(QMainWindow): settings = QSettings() fbasename = self.getEventFileName() exform = settings.value('data/exportFormat', 'QUAKEML') - # try: - # self.get_data().applyEVTData(self.getPicks()) - # except OverwriteError: + try: + self.get_data().applyEVTData(self.getPicks()) + except OverwriteError: # msgBox = QMessageBox() # msgBox.setText("Picks have been modified!") # msgBox.setInformativeText( @@ -955,11 +955,11 @@ class MainWindow(QMainWindow): # msgBox.setDefaultButton(QMessageBox.Save) # ret = msgBox.exec_() # if ret == QMessageBox.Save: - # self.get_data().resetPicks() - # return self.saveData() + self.get_data().resetPicks() + return self.saveData() # elif ret == QMessageBox.Cancel: # return False - # MP MP changed due to new event structure not uniquely refering to data object + # MP MP changed to suppress unnecessary user prompt try: self.get_data().exportEvent(fbasename, exform) except FormatError as e: diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 2c8398ed..e1085601 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -0be5-dirty +ab97-dirty