Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop

This commit is contained in:
Marcel Paffrath 2015-11-16 12:12:11 +01:00
commit 2e45456a6e

View File

@ -41,6 +41,7 @@ from obspy import UTCDateTime, readEvents
from pylot.core.read.data import Data
from pylot.core.read.inputs import FilterOptions, AutoPickParameter
from pylot.core.pick.autopick import autopickevent
from pylot.core.loc.nll import locate as locateNll
from pylot.core.util.defaults import FILTERDEFAULTS
from pylot.core.util.errors import FormatError, DatastructureError,\
OverwriteError
@ -54,6 +55,7 @@ from pylot.core.util.thread import AutoPickThread
from pylot.core.util.version import get_git_version as _getVersionString
import icons_rc
locateTool = dict(nll=locateNll)
class MainWindow(QMainWindow):
__version__ = _getVersionString()
@ -90,7 +92,7 @@ class MainWindow(QMainWindow):
self.filteroptions = {}
self.pickDlgs = {}
self.picks = {}
self.locflag(False)
self.loc = False
# UI has to be set up before(!) children widgets are about to show up
self.setupUi()
@ -765,7 +767,12 @@ class MainWindow(QMainWindow):
self.draw()
def locateEvent(self):
pass
settings = QSettings()
loctool = settings.value("loc/tool", "nll")
extlocpath = settings.value("%s/binPath".format(loctool), None)
locroot = settings.value("%s/rootPath".format(loctool), None)
if extlocpath is None or locroot is None:
pass
def check4Loc(self):
return self.picksNum() > 4