[close #190] pick handling is now consistent for manual and automatic picks
manual and automatic picks are now treated in the same way but separately; implementation of comparison routines should be much more easy now
This commit is contained in:
parent
14048d6784
commit
7b22bce2b0
@ -356,7 +356,10 @@ class MainWindow(QMainWindow):
|
|||||||
settings = QSettings()
|
settings = QSettings()
|
||||||
return settings.value("data/dataRoot")
|
return settings.value("data/dataRoot")
|
||||||
|
|
||||||
def loadData(self, fname=None):
|
def loadAutoPicks(self):
|
||||||
|
self.loadData(type='auto')
|
||||||
|
|
||||||
|
def loadData(self, fname=None, type='manual'):
|
||||||
if not self.okToContinue():
|
if not self.okToContinue():
|
||||||
return
|
return
|
||||||
if fname is None:
|
if fname is None:
|
||||||
@ -373,7 +376,7 @@ class MainWindow(QMainWindow):
|
|||||||
fname = unicode(action.data().toString())
|
fname = unicode(action.data().toString())
|
||||||
self.setFileName(fname)
|
self.setFileName(fname)
|
||||||
self.data += Data(self, evtdata=self.getFileName())
|
self.data += Data(self, evtdata=self.getFileName())
|
||||||
self.updatePicks()
|
self.updatePicks(type=type)
|
||||||
self.drawPicks()
|
self.drawPicks()
|
||||||
|
|
||||||
def getLastEvent(self):
|
def getLastEvent(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user