[closes #207, closes #208] when supressing user prompt, applyEVTData to data object was accidently removed
This commit is contained in:
parent
ab979e9b10
commit
1b512a0864
12
QtPyLoT.py
12
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:
|
||||
|
@ -1 +1 @@
|
||||
0be5-dirty
|
||||
ab97-dirty
|
||||
|
Loading…
Reference in New Issue
Block a user