Merge branch 'develop' into feature/obspy_dmt_interface

This commit is contained in:
Marcel Paffrath 2018-04-26 15:01:29 +02:00
commit 3d1d97dd26
2 changed files with 6 additions and 1 deletions

View File

@ -1719,6 +1719,10 @@ class MainWindow(QMainWindow):
self.dataPlot.setPermTextRight(wf_stat[status], wf_stat_color[status])
def check_plot_quantity(self):
"""
Check the amount of samples to be plotted and ask user to reduce the amount if it is too large.
:rtype: None
"""
settings = QSettings()
nth_sample = int(settings.value("nth_sample")) if settings.value("nth_sample") else 1
npts_max = 1e7

View File

@ -454,7 +454,8 @@ def getLogin():
:return: login ID
:rtype: str
"""
return os.getlogin()
import getpass
return getpass.getuser()
def getOwner(fn):