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

[fix] parameters tab window flag for new qwidget window with parent

Browse Source
This commit is contained in:
Marcel Paffrath 2017-04-13 11:55:09 +02:00
parent de38b60893
commit 22ced8c07c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
e75c-dirty de38-dirty

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

@ -1530,13 +1530,16 @@ class ParametersTab(PropTab):
def __init__(self, parent=None, infile=None): def __init__(self, parent=None, infile=None):
super(ParametersTab, self).__init__(parent) super(ParametersTab, self).__init__(parent)
self.commonpicksettings = QPushButton("Common Settings autoPyLoT") self.commonpicksettings = QPushButton("&Common Settings autoPyLoT")
self.specialpicksettings = QPushButton("Special Settings autoPyLoT") self.specialpicksettings = QPushButton("Special Settings autoPyLoT")
self.CFsettings = QPushButton("Special Settings for Calculating CF's") self.CFsettings = QPushButton("Special Settings for Calculating CF's")
self.FMsettings = QPushButton("Settings for First-Motion Picker") self.FMsettings = QPushButton("Settings for First-Motion Picker")
self.qsettings = QPushButton("Quality Assessment") self.qsettings = QPushButton("Quality Assessment")
self.sourcepara = QPushButton("Settings for Source Parameter Estimation") self.sourcepara = QPushButton("Settings for Source Parameter Estimation")
self.parent = parent
self.infile = infile
layout = QGridLayout() layout = QGridLayout()
layout.addWidget(self.commonpicksettings, 0, 0) layout.addWidget(self.commonpicksettings, 0, 0)
layout.addWidget(self.specialpicksettings, 1, 0) layout.addWidget(self.specialpicksettings, 1, 0)
@ -1546,14 +1549,14 @@ class ParametersTab(PropTab):
layout.addWidget(self.sourcepara, 2, 1) layout.addWidget(self.sourcepara, 2, 1)
self.setLayout(layout) self.setLayout(layout)
self.commonpicksettings.clicked.connect(lambda: self.ButtonCommonPickSettings(infile)) self.commonpicksettings.clicked.connect(self.ButtonCommonPickSettings)
def ButtonCommonPickSettings(self, infile): def ButtonCommonPickSettings(self):#, event=None):
# get parameters from pylot.in-file # get parameters from pylot.in-file
para = AutoPickParameter(infile) para = AutoPickParameter(self.infile)
pstart = para.get('pstart') pstart = para.get('pstart')
pstop = para.get('pstop') pstop = para.get('pstop')
sstart = para.get('sstart') sstart = para.get('sstart')
@ -1563,7 +1566,7 @@ class ParametersTab(PropTab):
bph1 = para.get('bph1') bph1 = para.get('bph1')
bph2 = para.get('bph2') bph2 = para.get('bph2')
settings = QSettings() settings = QSettings()
self.widget = QWidget() self.widget = QWidget(self.parent, 1)
self.widget.setWindowTitle("Common Settings autoPyLoT") self.widget.setWindowTitle("Common Settings autoPyLoT")
self.pCFcalcwinLabel = QLabel("Start/end time (relative to waveform onset) for calculating CF from waveform for P-pick [s]") self.pCFcalcwinLabel = QLabel("Start/end time (relative to waveform onset) for calculating CF from waveform for P-pick [s]")