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

moved widget to utils widgets for consistency and reusability

Browse Source 
additionally the filter for PHASES and LOC files has been modified to avoid false selection
This commit is contained in:
Sebastian Wehling-Benatelli 2016-06-02 09:39:01 +02:00
parent 2395c12b26
commit de89fc83ce
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
QtPyLoT.py
View File

@ -53,7 +53,7 @@ from pylot.core.util.utils import fnConstructor, getLogin, \
getGlobalTimes getGlobalTimes
from pylot.core.io.location import create_creation_info, create_event from pylot.core.io.location import create_creation_info, create_event
from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg, \ from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg, \
MPLWidget, PropertiesDlg, HelpForm, createAction, PickDlg MPLWidget, PropertiesDlg, HelpForm, createAction, PickDlg, getDataType
from pylot.core.util.structure import DATASTRUCTURE from pylot.core.util.structure import DATASTRUCTURE
from pylot.core.util.thread import AutoPickThread from pylot.core.util.thread import AutoPickThread
from pylot.core.util.version import get_git_version as _getVersionString from pylot.core.util.version import get_git_version as _getVersionString
@ -389,43 +389,32 @@ class MainWindow(QMainWindow):
settings = QSettings() settings = QSettings()
return settings.value("data/dataRoot") return settings.value("data/dataRoot")
def getType(self):
type = QInputDialog().getItem(self, self.tr("Select phases type"),
self.tr("Type:"), [self.tr("manual"),
self.tr("automatic")])
if type[0].startswith('auto'):
type = 'auto'
else:
type = type[0]
return type
def load_autopicks(self, fname=None): def load_autopicks(self, fname=None):
self.load_data(fname, type='auto') self.load_data(fname, type='auto')
def load_loc(self, fname=None): def load_loc(self, fname=None):
self.load_data(fname, type='loc') type = getDataType(self)
self.load_data(fname, type=type, loc=True)
def load_pilotevent(self): def load_pilotevent(self):
filt = "PILOT location files (*.mat)" filt = "PILOT location files (*LOC*.mat)"
caption = "Select PILOT location file" caption = "Select PILOT location file"
fn_loc = QFileDialog().getOpenFileName(self, caption=caption, fn_loc = QFileDialog().getOpenFileName(self, caption=caption,
filter=filt, dir=self.getRoot()) filter=filt, dir=self.getRoot())
fn_loc = fn_loc[0] fn_loc = fn_loc[0]
loc_dir = os.path.split(fn_loc)[0] loc_dir = os.path.split(fn_loc)[0]
filt = "PILOT phases files (*.mat)" filt = "PILOT phases files (*PHASES*.mat)"
caption = "Select PILOT phases file" caption = "Select PILOT phases file"
fn_phases = QFileDialog().getOpenFileName(self, caption=caption, fn_phases = QFileDialog().getOpenFileName(self, caption=caption,
filter=filt, dir=loc_dir) filter=filt, dir=loc_dir)
fn_phases = fn_phases[0] fn_phases = fn_phases[0]
type = self.getType() type = getDataType(self)
fname_dict = dict(phasfn=fn_phases, locfn=fn_loc) fname_dict = dict(phasfn=fn_phases, locfn=fn_loc)
self.load_data(fname_dict, type=type) self.load_data(fname_dict, type=type)
def load_data(self, fname=None, type='manual'): def load_data(self, fname=None, type='manual', loc=False):
if not self.okToContinue(): if not self.okToContinue():
return return
if fname is None: if fname is None:
@ -435,7 +424,7 @@ class MainWindow(QMainWindow):
self.set_fname(fname, type) self.set_fname(fname, type)
data = dict(auto=self.autodata, manual=self.data) data = dict(auto=self.autodata, manual=self.data)
data[type] += Data(self, evtdata=fname) data[type] += Data(self, evtdata=fname)
if 'loc' not in type: if not loc:
self.updatePicks(type=type) self.updatePicks(type=type)
self.drawPicks(picktype=type) self.drawPicks(picktype=type)
self.draw() self.draw()
@ -485,9 +474,9 @@ class MainWindow(QMainWindow):
filt = "Supported file formats" \ filt = "Supported file formats" \
" (*.mat *.qml *.xml *.kor *.evt)" " (*.mat *.qml *.xml *.kor *.evt)"
caption = "Open an event file" caption = "Open an event file"
fname = QFileDialog().getOpenFileName(self, fname = QFileDialog().getOpenFileName(self, caption=caption,
caption=caption, filter=filt,
filter=filt) dir=self.getRoot())
fname = fname[0] fname = fname[0]
else: else:
fname = str(action.data().toString()) fname = str(action.data().toString())

15
pylot/core/util/widgets.py
View File

@ -20,7 +20,8 @@ from matplotlib.widgets import MultiCursor
from PySide.QtGui import QAction, QApplication, QComboBox, QDateTimeEdit, \ from PySide.QtGui import QAction, QApplication, QComboBox, QDateTimeEdit, \
QDialog, QDialogButtonBox, QDoubleSpinBox, QGroupBox, QGridLayout, \ QDialog, QDialogButtonBox, QDoubleSpinBox, QGroupBox, QGridLayout, \
QIcon, QKeySequence, QLabel, QLineEdit, QMessageBox, QPixmap, QSpinBox, \ QIcon, QKeySequence, QLabel, QLineEdit, QMessageBox, QPixmap, QSpinBox, \
QTabWidget, QToolBar, QVBoxLayout, QWidget, QPushButton, QFileDialog QTabWidget, QToolBar, QVBoxLayout, QWidget, QPushButton, QFileDialog, \
QInputDialog
from PySide.QtCore import QSettings, Qt, QUrl, Signal, Slot from PySide.QtCore import QSettings, Qt, QUrl, Signal, Slot
from PySide.QtWebKit import QWebView from PySide.QtWebKit import QWebView
from obspy import Stream, UTCDateTime from obspy import Stream, UTCDateTime
@ -33,6 +34,18 @@ from pylot.core.util.utils import prepTimeAxis, getGlobalTimes, scaleWFData, \
demeanTrace, isSorted, findComboBoxIndex demeanTrace, isSorted, findComboBoxIndex
def getDataType(parent):
type = QInputDialog().getItem(parent, "Select phases type", "Type:",
["manual", "automatic"])
if type[0].startswith('auto'):
type = 'auto'
else:
type = type[0]
return type
def createAction(parent, text, slot=None, shortcut=None, icon=None, def createAction(parent, text, slot=None, shortcut=None, icon=None,
tip=None, checkable=False): tip=None, checkable=False):
""" """