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

code clean-up following several conventions

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli
2015-06-11 10:07:21 +02:00
parent 3d8bea8f7e
commit 546e919dc9
10 changed files with 140 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pylot/__init__.py
View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
#--------------------------------------------------------
# --------------------------------------------------------
# Purpose: Convience imports for PyLoT
#
'''
@@ -24,4 +24,4 @@ The development of PyLoT is part of the joint research project MAGS2.
:license:
GNU Lesser General Public License, Version 3
(http://www.gnu.org/copyleft/lesser.html)
'''
'''

4
pylot/core/pick/utils.py
View File

@@ -161,7 +161,7 @@ def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None):
index1 = []
i = 0
for j in range(ipick[0][1], ipick[0][len(t[ipick]) - 1]):
i = i + 1
i += 1
if xraw[j - 1] <= 0 and xraw[j] >= 0:
zc1.append(t[ipick][i])
index1.append(i)
@@ -196,7 +196,7 @@ def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None):
index2 = []
i = 0
for j in range(ipick[0][1], ipick[0][len(t[ipick]) - 1]):
i = i + 1
i += 1
if xfilt[j - 1] <= 0 and xfilt[j] >= 0:
zc2.append(t[ipick][i])
index2.append(i)

2
pylot/core/read/__init__.py
View File

@@ -2,5 +2,3 @@ from pylot.core.read.inputs import AutoPickParameter, FilterOptions
from pylot.core.read.io import readPILOTEvent
from pylot.core.read.data import GenericDataStructure, SeiscompDataStructure, \
PilotDataStructure, Data

21
pylot/core/read/inputs.py
View File

@@ -124,20 +124,10 @@ class AutoPickParameter(object):
for key, value in self.__parameter.iteritems():
yield key, value
def hasParam(self, *args):
def test(param):
try:
self.__parameter[param]
return True
except KeyError:
return False
try:
for param in args:
return test(param)
except TypeError:
return test(args)
def hasParam(self, parameter):
if self.__parameter.has_key(parameter):
return True
return False
def getParam(self, *args):
try:
@@ -157,7 +147,8 @@ class AutoPickParameter(object):
self.__setitem__(param, value)
print self
def _printParameterError(self, errmsg):
@staticmethod
def _printParameterError(errmsg):
print 'ParameterError:\n non-existent parameter %s' % errmsg
def export2File(self, fnout):

2
pylot/core/util/errors.py
View File

@@ -9,8 +9,10 @@ Created on Thu Mar 20 09:47:04 2014
class OptionsError(Exception):
pass
class FormatError(Exception):
pass
class DatastructureError(Exception):
pass

4
pylot/core/util/structure.py
View File

@@ -8,5 +8,5 @@ Created on Wed Jan 26 17:47:25 2015
from pylot.core.read import SeiscompDataStructure, PilotDataStructure
DATASTRUCTURE = {'PILOT':PilotDataStructure, 'SeisComP':SeiscompDataStructure,
None:None}
DATASTRUCTURE = {'PILOT': PilotDataStructure, 'SeisComP': SeiscompDataStructure,
None: None}

4
pylot/core/util/version.py
View File

@@ -31,7 +31,7 @@
#
# include RELEASE-VERSION
__all__ = ("get_git_version")
__all__ = "get_git_version"
# NO IMPORTS FROM PYLOT IN THIS FILE! (file gets used at installation time)
import os
@@ -108,4 +108,4 @@ def get_git_version(abbrev=4):
if __name__ == "__main__":
print get_git_version()
print get_git_version()

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

@@ -16,9 +16,9 @@ from matplotlib.figure import Figure
from matplotlib.backends.backend_qt4agg import FigureCanvas
from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg
from matplotlib.widgets import MultiCursor
from PySide.QtGui import QAction, QApplication,QComboBox, QDateTimeEdit,\
QDialog, QDialogButtonBox, QDoubleSpinBox, QGroupBox, QGridLayout,\
QIcon, QKeySequence, QLabel, QLineEdit, QMessageBox, QPixmap, QSpinBox,\
from PySide.QtGui import QAction, QApplication, QComboBox, QDateTimeEdit, \
QDialog, QDialogButtonBox, QDoubleSpinBox, QGroupBox, QGridLayout, \
QIcon, QKeySequence, QLabel, QLineEdit, QMessageBox, QPixmap, QSpinBox, \
QTabWidget, QToolBar, QVBoxLayout, QWidget
from PySide.QtCore import QSettings, Qt, QUrl, Signal, Slot
from PySide.QtWebKit import QWebView
@@ -48,8 +48,8 @@ def createAction(parent, text, slot=None, shortcut=None, icon=None,
action.setCheckable(True)
return action
class MPLWidget(FigureCanvas):
class MPLWidget(FigureCanvas):
def __init__(self, parent=None, xlabel='x', ylabel='y', title='Title'):
self._parent = None
@@ -65,7 +65,8 @@ class MPLWidget(FigureCanvas):
# initialize super class
FigureCanvas.__init__(self, self.figure)
# add an cursor for station selection
self.multiCursor = MultiCursor(self.figure.canvas, (self.axes,), horizOn=True,
self.multiCursor = MultiCursor(self.figure.canvas, (self.axes,),
horizOn=True,
color='m', lw=1)
# update labels of the entire widget
self.updateWidget(xlabel, ylabel, title)
@@ -126,7 +127,6 @@ class MPLWidget(FigureCanvas):
self.axes.set_xlabel(text)
self.draw()
def updateYLabel(self, text):
self.axes.set_ylabel(text)
self.draw()
@@ -142,12 +142,12 @@ class MPLWidget(FigureCanvas):
def insertLabel(self, pos, text):
pos = pos / max(self.axes.ylim)
axann = self.axes.annotate(text, xy=(.03, pos), xycoords='axes fraction')
axann = self.axes.annotate(text, xy=(.03, pos),
xycoords='axes fraction')
axann.set_bbox(dict(facecolor='lightgrey', alpha=.6))
class multiComponentPlot(FigureCanvas):
def __init__(self, data, parent=None, components='ZNE'):
self.data = data
@@ -211,7 +211,7 @@ class multiComponentPlot(FigureCanvas):
# plot individual component traces in separate subplots
for n, comp in enumerate(components):
nsub = '{0}1{1}'.format(self.noc, n+1)
nsub = '{0}1{1}'.format(self.noc, n + 1)
if n >= 1:
subax = self.figure.add_subplot(nsub, sharex=self.axesdict[0])
else:
@@ -239,7 +239,6 @@ class multiComponentPlot(FigureCanvas):
class PickDlg(QDialog):
def __init__(self, parent=None, data=None, station=None, rotate=False):
super(PickDlg, self).__init__(parent)
@@ -275,8 +274,8 @@ class PickDlg(QDialog):
# plot data
self.getPlotWidget().plotWFData(wfdata=self.getWFData(),
title=self.getStation())
self.limits = {'xlims' : self.getPlotWidget().axes.get_xlim(),
'ylims' : self.getPlotWidget().axes.get_ylim()}
self.limits = {'xlims': self.getPlotWidget().axes.get_xlim(),
'ylims': self.getPlotWidget().axes.get_ylim()}
self.apd = self.getWFData()
# set plot labels
@@ -420,9 +419,10 @@ class PickDlg(QDialog):
def selectWFData(self, channel):
component = channel[-1].upper()
wfdata = Stream()
def selectTrace(trace, components):
if trace.stats.channel[-1].upper() in components:
return trace
def selectTrace(tr, components):
if tr.stats.channel[-1].upper() in components:
return tr
if component == 'E' or component == 'N':
for trace in self.getWFData():
@@ -462,10 +462,10 @@ class PickDlg(QDialog):
# see also Diehl et al. 2009
res_wins = {
'HRW' : 2.,
'MRW' : 5.,
'LRW' : 10.,
'VLRW' : 15.
'HRW': 2.,
'MRW': 5.,
'LRW': 10.,
'VLRW': 15.
}
result = getSNR(wfdata, (5., .5, 2.), ini_pick)
@@ -501,7 +501,7 @@ class PickDlg(QDialog):
def setPick(self, gui_event):
# setting pick
pick = gui_event.xdata # get pick time relative to the traces timeaxis not to the global
pick = gui_event.xdata # get pick time relative to the traces timeaxis not to the global
channel = self.getChannelID(round(gui_event.ydata))
wfdata = self.getAPD().copy().select(channel=channel)
@@ -512,12 +512,7 @@ class PickDlg(QDialog):
phase = self.selectPhase.currentText()
# save pick times for actual phase
phasepicks = {}
phasepicks['epp'] = epp
phasepicks['lpp'] = lpp
phasepicks['mpp'] = pick
phasepicks['spe'] = spe
phasepicks = {'epp': epp, 'lpp': lpp, 'mpp': pick, 'spe': spe}
try:
oldphasepick = self.picks[phase]
@@ -570,10 +565,10 @@ class PickDlg(QDialog):
lpp = picks['lpp']
spe = picks['spe']
ax.fill_between([epp, lpp],ylims[0], ylims[1], alpha=.5, color='c')
ax.plot([mpp-spe, mpp-spe], ylims, 'c--',
ax.fill_between([epp, lpp], ylims[0], ylims[1], alpha=.5, color='c')
ax.plot([mpp - spe, mpp - spe], ylims, 'c--',
[mpp, mpp], ylims, 'b-',
[mpp+spe, mpp+spe], ylims, 'c--')
[mpp + spe, mpp + spe], ylims, 'c--')
self.getPlotWidget().draw()
@@ -648,7 +643,7 @@ class PickDlg(QDialog):
curr_ylim = widget.axes.get_ylim()
if gui_event.button == 'up':
scale_factor = 1/factor
scale_factor = 1 / factor
elif gui_event.button == 'down':
# deal with zoom out
scale_factor = factor
@@ -682,8 +677,8 @@ class PickDlg(QDialog):
self.apply()
QDialog.accept(self)
class PropertiesDlg(QDialog):
class PropertiesDlg(QDialog):
def __init__(self, parent=None):
super(PropertiesDlg, self).__init__(parent)
@@ -707,7 +702,8 @@ class PropertiesDlg(QDialog):
self.buttonBox.accepted.connect(self.accept)
self.buttonBox.rejected.connect(self.reject)
self.buttonBox.button(QDialogButtonBox.Apply).clicked.connect(self.apply)
self.buttonBox.button(QDialogButtonBox.Apply).clicked.connect(
self.apply)
def accept(self, *args, **kwargs):
self.apply()
@@ -728,7 +724,6 @@ class PropertiesDlg(QDialog):
class PropTab(QWidget):
def __init__(self, parent=None):
super(PropTab, self).__init__(parent)
@@ -737,7 +732,6 @@ class PropTab(QWidget):
class InputsTab(PropTab):
def __init__(self, parent):
super(InputsTab, self).__init__(parent)
@@ -775,15 +769,13 @@ class InputsTab(PropTab):
self.setLayout(layout)
def getValues(self):
values = {}
values["data/dataRoot"] = self.dataDirEdit.text()
values["user/FullName"] = self.fullNameEdit.text()
values["data/Structure"] = self.structureSelect.currentText()
values = {"data/dataRoot": self.dataDirEdit.text(),
"user/FullName": self.fullNameEdit.text(),
"data/Structure": self.structureSelect.currentText()}
return values
class OutputsTab(PropTab):
def __init__(self, parent=None):
super(OutputsTab, self).__init__(parent)
@@ -808,12 +800,11 @@ class OutputsTab(PropTab):
self.setLayout(layout)
def getValues(self):
values = {}
values["output/Format"] = self.eventOutputComboBox.currentText()
values = {"output/Format": self.eventOutputComboBox.currentText()}
return values
class PhasesTab(PropTab):
class PhasesTab(PropTab):
def __init__(self, parent=None):
super(PhasesTab, self).__init__(parent)
@@ -821,7 +812,6 @@ class PhasesTab(PropTab):
class GraphicsTab(PropTab):
def __init__(self, parent=None):
super(GraphicsTab, self).__init__(parent)
@@ -850,13 +840,12 @@ class NewEventDlg(QDialog):
self.buttonBox.rejected.connect(self.reject)
def getValues(self):
return {'origintime' : self.eventTimeEdit.dateTime().toPython(),
'latitude' : self.latEdit.text(),
'longitude' : self.lonEdit.text(),
'depth' : self.depEdit.text()}
return {'origintime': self.eventTimeEdit.dateTime().toPython(),
'latitude': self.latEdit.text(),
'longitude': self.lonEdit.text(),
'depth': self.depEdit.text()}
def setupUI(self):
# create widget objects
timeLabel = QLabel()
timeLabel.setText("Select time: ")
@@ -887,8 +876,8 @@ class NewEventDlg(QDialog):
self.setLayout(grid)
class FilterOptionsDialog(QDialog):
class FilterOptionsDialog(QDialog):
def __init__(self, parent=None, titleString="Filter options",
filterOptions=None):
"""
@@ -925,8 +914,10 @@ class FilterOptionsDialog(QDialog):
if _enable:
self.freqminSpinBox.setValue(self.getFilterOptions().getFreq()[0])
if self.getFilterOptions().getFilterType() in ['bandpass', 'bandstop']:
self.freqmaxSpinBox.setValue(self.getFilterOptions().getFreq()[1])
if self.getFilterOptions().getFilterType() in ['bandpass',
'bandstop']:
self.freqmaxSpinBox.setValue(
self.getFilterOptions().getFreq()[1])
else:
try:
self.freqmaxSpinBox.setValue(self.getFilterOptions().getFreq())
@@ -963,7 +954,7 @@ class FilterOptionsDialog(QDialog):
self.freqmaxSpinBox.setEnabled(_enable)
self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok|
self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok |
QDialogButtonBox.Cancel)
grid = QGridLayout()
@@ -980,7 +971,6 @@ class FilterOptionsDialog(QDialog):
self.buttonBox.accepted.connect(self.accept)
self.buttonBox.rejected.connect(self.reject)
def updateUi(self):
_enable = False
if self.selectTypeCombo.currentText() not in ['bandpass', 'bandstop']:
@@ -993,10 +983,9 @@ class FilterOptionsDialog(QDialog):
self.freqmaxLabel.setEnabled(_enable)
self.freqmaxSpinBox.setEnabled(_enable)
self.getFilterOptions().setFilterType(self.selectTypeCombo.currentText())
freq = []
freq.append(self.freqminSpinBox.value())
self.getFilterOptions().setFilterType(
self.selectTypeCombo.currentText())
freq = [self.freqminSpinBox.value()]
if _enable:
if self.freqminSpinBox.value() > self.freqmaxSpinBox.value():
QMessageBox.warning(self, "Value error",
@@ -1019,7 +1008,6 @@ class FilterOptionsDialog(QDialog):
class LoadDataDlg(QDialog):
def __init__(self, parent=None):
super(LoadDataDlg, self).__init__(parent)
@@ -1027,8 +1015,8 @@ class LoadDataDlg(QDialog):
class HelpForm(QDialog):
def __init__(self, page=QUrl('https://ariadne.geophysik.rub.de/trac/PyLoT'), parent=None):
def __init__(self, page=QUrl('https://ariadne.geophysik.rub.de/trac/PyLoT'),
parent=None):
super(HelpForm, self).__init__(parent)
self.setAttribute(Qt.WA_DeleteOnClose)
self.setAttribute(Qt.WA_GroupLeader)