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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	pylot/core/util/widgets.py
This commit is contained in:
Marcel Paffrath 2024-04-09 16:12:03 +02:00
commit 31ca0d7a85
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -860,12 +860,6 @@ class WaveformWidgetPG(QtWidgets.QWidget):
def clearPlotDict(self):
self.plotdict = dict()
<<<<<<< Updated upstream
def plotWFData(self, wfdata, wfsyn=None, title=None, zoomx=None, zoomy=None,
noiselevel=None, scaleddata=False, mapping=True,
component='*', nth_sample=1, iniPick=None, verbosity=0,
method='normal', gain=1.):
=======
def plotWFData(self, wfdata, wfsyn=None, title=None, scaleddata=False, mapping=True,
component='*', nth_sample=1, verbosity=0, method='normal', gain=1., shift_syn=0.2):
def station_sort(nslc):
@ -882,7 +876,6 @@ class WaveformWidgetPG(QtWidgets.QWidget):
# fallback to default sorting
return sorted(nslc)
>>>>>>> Stashed changes
if not wfdata:
print('Nothing to plot.')
return