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

This commit is contained in:
Sebastian Wehling-Benatelli 2015-06-28 19:35:01 +02:00
parent e542aa70d9
commit a854cf2762

View File

@ -567,10 +567,11 @@ 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()
if self.filterAction.isChecked(): filtoptions = None
if phase: if phase:
filtoptions = self.getFilterOptions(phase).parseFilterOptions() filtoptions = self.getFilterOptions(phase).parseFilterOptions()
else: if self.filterAction.isChecked():
if not phase:
filtoptions = FilterOptionsDialog.getFilterObject() filtoptions = FilterOptionsDialog.getFilterObject()
filtoptions = filtoptions.parseFilterOptions() filtoptions = filtoptions.parseFilterOptions()
if filtoptions is not None: if filtoptions is not None: