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

Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Browse Source
This commit is contained in:
Ludger Küperkoch
2017-08-15 16:56:17 +02:00
parent 1dacc08b26 ff6f2ed2d9
commit 4d8dc912ac
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -476,7 +476,7 @@ def getsignalwin(t, t1, tsignal):
'''
# get signal window
isignal, = np.where((t <= min([t1 + tsignal, len(t)])) \
isignal, = np.where((t <= min([t1 + tsignal, t[-1]])) \
& (t >= t1))
if np.size(isignal) < 1:
print("getsignalwin: Empty array isignal, check signal window!")

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

@@ -560,8 +560,9 @@ class WaveformWidgetPG(QtGui.QWidget):
vb.setYRange(float(lims[0]), float(lims[1]), padding=0)
def setYTickLabels(self, pos, labels):
ticks = zip(pos, labels)
minorTicks = [(0, 0) for item in labels]
pos = list(pos)
ticks = list(zip(pos, labels))
minorTicks = [(0, 0) for _ in labels]
# leftAx.tickLength = 5
# leftAx.orientation = 'right'
self.getAxItem('left').setTicks([ticks, minorTicks])
@@ -2452,7 +2453,7 @@ class PylotParaBox(QtGui.QWidget):
self.add_special_pick_parameters_tab()
self.params_to_gui()
self._toggle_advanced_settings()
self.resize(720, 1280)
self.resize(720, 860)
self.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
self.accepted.connect(self.params_from_gui)
self.rejected.connect(self.params_to_gui)