From f46e2a6ac14be8ba40a2ab5bd3add3b04b3a326d Mon Sep 17 00:00:00 2001 From: Jan Feil <11638228+jfeil@users.noreply.github.com> Date: Tue, 22 Mar 2022 00:33:40 +0100 Subject: [PATCH] Fix issue with smaller/larger switched and introduce better default values --- src/filter_editor.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/filter_editor.py b/src/filter_editor.py index 60684f4..27d91b6 100644 --- a/src/filter_editor.py +++ b/src/filter_editor.py @@ -100,8 +100,16 @@ def __update_filteroptions(self, index): self.filter = QCheckBox() elif current_params.datatype == datetime: self.filter = QDateEdit() + cur_date = datetime.today() + if cur_date.month < 6: + year = cur_date.year - 1 + else: + year = cur_date.year + cur_date = cur_date.replace(day=1, month=6, year=year) + self.filter.setDate(cur_date) elif current_params.datatype == int: self.filter = QSpinBox() + self.filter.setValue(1) else: raise ValueError('Invalid FilterOption!') @@ -126,16 +134,16 @@ def create_filter(self) -> Tuple[str, Callable]: if filter_option == FilterOption.smaller_equal: def filter_callable(x): - return value <= x + return value >= x elif filter_option == FilterOption.smaller: def filter_callable(x): - return value < x + return value > x elif filter_option == FilterOption.larger_equal: def filter_callable(x): - return value >= x + return value <= x elif filter_option == FilterOption.larger: def filter_callable(x): - return value > x + return value < x elif filter_option == FilterOption.equal: def filter_callable(x): return value == x