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

use default filter options for all expected phases set up by the project leader

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2015-06-28 19:35:01 +02:00
parent e542aa70d9
commit a854cf2762
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -567,21 +567,22 @@ class PickDlg(QDialog):
old_title = self.getPlotWidget().getAxes().get_title() old_title = self.getPlotWidget().getAxes().get_title()
title = None title = None
phase = self.selectPhase.currentText() phase = self.selectPhase.currentText()
filtoptions = None
if phase:
filtoptions = self.getFilterOptions(phase).parseFilterOptions()
if self.filterAction.isChecked(): if self.filterAction.isChecked():
if phase: if not phase:
filtoptions = self.getFilterOptions(phase).parseFilterOptions()
else:
filtoptions = FilterOptionsDialog.getFilterObject() filtoptions = FilterOptionsDialog.getFilterObject()
filtoptions = filtoptions.parseFilterOptions() filtoptions = filtoptions.parseFilterOptions()
if filtoptions is not None: if filtoptions is not None:
data.filter(**filtoptions) data.filter(**filtoptions)
if old_title.endswith(')'): if old_title.endswith(')'):
title = old_title[:-1] + ', filtered)' title = old_title[:-1] + ', filtered)'
else:
title = old_title + ' (filtered)'
else: else:
if old_title.endswith(' (filtered)'): title = old_title + ' (filtered)'
title = old_title.replace(' (filtered)', '') else:
if old_title.endswith(' (filtered)'):
title = old_title.replace(' (filtered)', '')
if title is None: if title is None:
title = old_title title = old_title
self.getPlotWidget().plotWFData(wfdata=data, title=title, self.getPlotWidget().plotWFData(wfdata=data, title=title,