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

Removed double read in of input file.

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-04-03 11:54:41 +02:00
parent 43a7da41f2
commit 3d5cce9e7a
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
QtPyLoT.py
View File

@ -15,7 +15,7 @@ Some icons are out of a free of charge icon set, which can be found here:
https://www.iconfinder.com/iconsets/flavour https://www.iconfinder.com/iconsets/flavour
:author: :author:
Sebastian Wehling-Benatelli Sebastian Wehling-Benatelli / Ludger Küperkoch
:copyright: :copyright:
The PyLoT Development Team (https://ariadne.geophysik.rub.de/trac/PyLoT) The PyLoT Development Team (https://ariadne.geophysik.rub.de/trac/PyLoT)
:license: :license:
@ -47,8 +47,7 @@ from pylot.core.pick.compare import Comparison
from pylot.core.pick.utils import symmetrize_error from pylot.core.pick.utils import symmetrize_error
from pylot.core.io.phases import picksdict_from_picks from pylot.core.io.phases import picksdict_from_picks
import pylot.core.loc.nll as nll import pylot.core.loc.nll as nll
from pylot.core.util.defaults import FILTERDEFAULTS, COMPNAME_MAP, \ from pylot.core.util.defaults import FILTERDEFAULTS, COMPNAME_MAP
AUTOMATIC_DEFAULTS
from pylot.core.util.errors import FormatError, DatastructureError, \ from pylot.core.util.errors import FormatError, DatastructureError, \
OverwriteError, ProcessingError OverwriteError, ProcessingError
from pylot.core.util.connection import checkurl from pylot.core.util.connection import checkurl
@ -93,7 +92,7 @@ class MainWindow(QMainWindow):
settings.setValue("user/Login", getLogin()) settings.setValue("user/Login", getLogin())
if settings.value("agency_id", None) is None: if settings.value("agency_id", None) is None:
agency = QInputDialog.getText(self, agency = QInputDialog.getText(self,
"Enter authority name (e.g. BUG):", "Enter authority/institution name:",
"Authority") "Authority")
settings.setValue("agency_id", agency) settings.setValue("agency_id", agency)
self.recentfiles = settings.value("data/recentEvents", []) self.recentfiles = settings.value("data/recentEvents", [])
@ -851,14 +850,10 @@ class MainWindow(QMainWindow):
Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea) Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
self.logDockWidget.setWidget(self.listWidget) self.logDockWidget.setWidget(self.listWidget)
self.addDockWidget(Qt.LeftDockWidgetArea, self.logDockWidget) self.addDockWidget(Qt.LeftDockWidgetArea, self.logDockWidget)
self.addListItem('loading default values for local data ...') self.addListItem('Loading default values from PyLoT-input file ...')
# may become obsolete if generalized input parameter a read from disc autopick_parameter = self._inputs
# during initialization
# TODO double check for obsolete read in of parameters
autopick_parameter = AutoPickParameter(AUTOMATIC_DEFAULTS)
self.addListItem(str(autopick_parameter)) self.addListItem(str(autopick_parameter))
# Create the worker thread and run it
self.thread = AutoPickThread(parent=self, self.thread = AutoPickThread(parent=self,
func=autopickevent, func=autopickevent,
data=self.get_data().getWFData(), data=self.get_data().getWFData(),