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

[closes #207, closes #208] when supressing user prompt, applyEVTData to data object was accidently removed

Browse Source
This commit is contained in:
Marcel Paffrath 2017-06-20 16:23:54 +02:00
parent ab979e9b10
commit 1b512a0864
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
QtPyLoT.py
View File

@ -943,9 +943,9 @@ class MainWindow(QMainWindow):
settings = QSettings() settings = QSettings()
fbasename = self.getEventFileName() fbasename = self.getEventFileName()
exform = settings.value('data/exportFormat', 'QUAKEML') exform = settings.value('data/exportFormat', 'QUAKEML')
# try: try:
# self.get_data().applyEVTData(self.getPicks()) self.get_data().applyEVTData(self.getPicks())
# except OverwriteError: except OverwriteError:
# msgBox = QMessageBox() # msgBox = QMessageBox()
# msgBox.setText("Picks have been modified!") # msgBox.setText("Picks have been modified!")
# msgBox.setInformativeText( # msgBox.setInformativeText(
@ -955,11 +955,11 @@ class MainWindow(QMainWindow):
# msgBox.setDefaultButton(QMessageBox.Save) # msgBox.setDefaultButton(QMessageBox.Save)
# ret = msgBox.exec_() # ret = msgBox.exec_()
# if ret == QMessageBox.Save: # if ret == QMessageBox.Save:
# self.get_data().resetPicks() self.get_data().resetPicks()
# return self.saveData() return self.saveData()
# elif ret == QMessageBox.Cancel: # elif ret == QMessageBox.Cancel:
# return False # 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: try:
self.get_data().exportEvent(fbasename, exform) self.get_data().exportEvent(fbasename, exform)
except FormatError as e: except FormatError as e:

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
0be5-dirty ab97-dirty