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

filterOptions has now a buttonBox

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2014-12-01 12:44:25 +01:00
parent 3e559f61da
commit 41684cd282
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,16 +200,22 @@ class FilterOptionsDialog(QDialog):
self.freqGroupLayout.addWidget(self.freqmaxSpinBox, 1, 1) self.freqGroupLayout.addWidget(self.freqmaxSpinBox, 1, 1)
self.freqGroupBox.setLayout(self.freqGroupLayout) self.freqGroupBox.setLayout(self.freqGroupLayout)
self.layoutEditables = QHBoxLayout() self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok|
self.layoutEditables.addWidget(self.freqGroupBox) QDialogButtonBox.Cancel)
self.layoutEditables.addLayout(self.selectTypeLayout)
grid = QGridLayout()
grid.addWidget(self.freqGroupBox, 0, 2, 1, 2)
grid.addLayout(self.selectTypeLayout, 1, 2, 1, 2)
grid.addWidget(self.buttonBox, 2, 2, 1, 2)
self.setLayout(self.layoutEditables) self.setLayout(grid)
self.freqminSpinBox.valueChanged.connect(self.updateUi) self.freqminSpinBox.valueChanged.connect(self.updateUi)
self.freqmaxSpinBox.valueChanged.connect(self.updateUi) self.freqmaxSpinBox.valueChanged.connect(self.updateUi)
self.orderSpinBox.valueChanged.connect(self.updateUi) self.orderSpinBox.valueChanged.connect(self.updateUi)
self.selectTypeCombo.currentIndexChanged.connect(self.updateUi) self.selectTypeCombo.currentIndexChanged.connect(self.updateUi)
self.buttonBox.accepted.connect(self.accept)
self.buttonBox.rejected.connect(self.reject)
def updateUi(self): def updateUi(self):
if self.selectTypeCombo.currentText() not in ['bandpass', 'bandstop']: if self.selectTypeCombo.currentText() not in ['bandpass', 'bandstop']:
@ -237,11 +243,14 @@ class FilterOptionsDialog(QDialog):
freq.append(self.freqmaxSpinBox.value()) freq.append(self.freqmaxSpinBox.value())
self.filterOptions.freq = freq self.filterOptions.freq = freq
self.filterOptions.order = self.orderSpinBox.value() self.filterOptions.order = self.orderSpinBox.value()
return self.getFilterOptions()
def getFilterOptions(self): def getFilterOptions(self):
return self.filterOptions return self.filterOptions
def accept(self):
self.updateUi()
QDialog.accept(self)
class LoadDataDlg(QDialog): class LoadDataDlg(QDialog):