mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/desktop-widgets/filterwidget2.cpp

255 lines
8.1 KiB
C++
Raw Normal View History

Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
#include "desktop-widgets/filterwidget2.h"
#include "desktop-widgets/simplewidgets.h"
Filter: implement close & reset Implement the close & reset functionality, by reseting the application state to "Default". This is currently the only state from where the fiter can be called. To make it consistent with CTRL^F, clear the filter in the hide() slot, which is called in both cases. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:41:07 +01:00
#include "desktop-widgets/mainwindow.h"
Filter: support imperial units 1) Choose the correct conversion function for comparison. 2) Add a unit suffix to the fields. 3) Update the suffixes on change of preferences. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-20 21:01:00 +01:00
#include "core/qthelper.h"
Filter: move number of shown dives to core We mark hidden/shown dives in the core but store the number of shown dives in the MultiFilterSortModel. Move this datum to the core for improved locality. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-11-17 16:23:00 +01:00
#include "core/divelist.h"
Filter: support imperial units 1) Choose the correct conversion function for comparison. 2) Add a unit suffix to the fields. 3) Update the suffixes on change of preferences. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-20 21:01:00 +01:00
#include "core/settings/qPrefUnit.h"
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
#include <QDoubleSpinBox>
Desktop: track if the filter widget is active This is not perfect - if you open the filter, set some criterion and then remove it again (without resetting the filter), this variable will give you a false positive). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-18 12:43:34 -08:00
FilterWidget2::FilterWidget2(QWidget* parent) :
QWidget(parent),
ignoreSignal(false)
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
{
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
ui.setupUi(this);
Struct FilterData The idea is that this struct will have all the needed data that will be passed to the filter model. Everything that happens on the filterwidget will fill out this struct, then forward it to the model, that in turn will activate the filter hiding some of the dives that matches on your divelist. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-12-06 20:07:47 +01:00
FilterData data;
Filter: extend range of allowed temperatures The temperature range 0-100 was inadequate in both supported scales (Celsius and Fahrenheit). Extend the range to encompass all physically meaningful values in both scales. Use the default-values to set the minimum and maximum of the UI-fields. Thus, these values are configurable in a single place. In the future we should use a scale-independent representation (e.g. mkelvin as in the rest of the code base). But this would mean implementing a custom widget with a conversion function. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-20 21:15:46 +01:00
// Use default values to set minimum and maximum air and water temperature.
ui.minAirTemp->setRange(data.minAirTemp, data.maxAirTemp);
ui.maxAirTemp->setRange(data.minAirTemp, data.maxAirTemp);
ui.minWaterTemp->setRange(data.minWaterTemp, data.maxWaterTemp);
ui.maxWaterTemp->setRange(data.minWaterTemp, data.maxWaterTemp);
Hide unimplemented components from search Those fields are not ready yet, hide them. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-11-16 15:23:39 +01:00
// TODO: unhide this when we discover how to search for equipment.
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
ui.equipment->hide();
Desktop: set filter negation texts The texts may not be perfect, but this is a start. Replace the buttons by combo-boxes. This will allow potential extension to "any of". Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-01-26 14:02:09 -08:00
ui.equipmentMode->hide();
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
ui.labelEquipment->hide();
Hide unimplemented components from search Those fields are not ready yet, hide them. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-11-16 15:23:39 +01:00
Desktop, Filter UI: make date/time consistent On all (most?) places we use separate date/time fields for the time of a dive, and we follow the setting from the preferences to format those. Make the new filter widget consistent, with respect to the to and from interval. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2019-01-20 17:00:56 +01:00
ui.fromDate->setDisplayFormat(prefs.date_format);
ui.fromTime->setDisplayFormat(prefs.time_format);
ui.toDate->setDisplayFormat(prefs.date_format);
ui.toTime->setDisplayFormat(prefs.time_format);
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
Filter: support imperial units 1) Choose the correct conversion function for comparison. 2) Add a unit suffix to the fields. 3) Update the suffixes on change of preferences. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-20 21:01:00 +01:00
// Initialize temperature fields to display correct unit.
temperatureChanged();
Filter: implement reset filter Move initialization to a separate function and connect that to the reset button. Two points of note: 1) Reseting the text-fields causes signals. Thus, signals have to be ignored during reset. Do this with a new flag. 2) To make reset of the from-date work, the from-date has to be initialized to a distinct value. Setting a default-constructed QDateTime leaves the widget unchanged. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:11:30 +01:00
connect(ui.clear, &QToolButton::clicked,
this, &FilterWidget2::clearFilter);
Filter: implement close & reset Implement the close & reset functionality, by reseting the application state to "Default". This is currently the only state from where the fiter can be called. To make it consistent with CTRL^F, clear the filter in the hide() slot, which is called in both cases. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:41:07 +01:00
connect(ui.close, &QToolButton::clicked,
this, &FilterWidget2::closeFilter);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
connect(ui.maxRating, &StarWidget::valueChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
connect(ui.minRating, &StarWidget::valueChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
connect(ui.maxVisibility, &StarWidget::valueChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
connect(ui.minVisibility, &StarWidget::valueChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.maxAirTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.minAirTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.maxWaterTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.minWaterTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Desktop, Filter UI: make date/time consistent On all (most?) places we use separate date/time fields for the time of a dive, and we follow the setting from the preferences to format those. Make the new filter widget consistent, with respect to the to and from interval. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2019-01-20 17:00:56 +01:00
connect(ui.fromDate, &QDateTimeEdit::dateChanged,
this, &FilterWidget2::updateFilter);
connect(ui.fromTime, &QDateTimeEdit::timeChanged,
this, &FilterWidget2::updateFilter);
connect(ui.toDate, &QDateTimeEdit::dateChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Desktop, Filter UI: make date/time consistent On all (most?) places we use separate date/time fields for the time of a dive, and we follow the setting from the preferences to format those. Make the new filter widget consistent, with respect to the to and from interval. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2019-01-20 17:00:56 +01:00
connect(ui.toTime, &QDateTimeEdit::timeChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
connect(ui.tags, &QLineEdit::textChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.tagsMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
Filter: quick implementation of negation Add negate buttons to the Tags, People, Location and Equipment filters. Currently, if nothing is entered the filter is ignored whether negate is on or off. One might think about filtering all dives without tags, etc. instead. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-22 09:32:39 +01:00
this, &FilterWidget2::updateFilter);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
connect(ui.people, &QLineEdit::textChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.peopleMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
Filter: quick implementation of negation Add negate buttons to the Tags, People, Location and Equipment filters. Currently, if nothing is entered the filter is ignored whether negate is on or off. One might think about filtering all dives without tags, etc. instead. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-22 09:32:39 +01:00
this, &FilterWidget2::updateFilter);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
connect(ui.location, &QLineEdit::textChanged,
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
this, &FilterWidget2::updateFilter);
Filter for logged/planned dives Add filter for dives having a planned dive computer or a logged dive computer. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2019-01-01 18:49:56 +01:00
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.locationMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
Filter: quick implementation of negation Add negate buttons to the Tags, People, Location and Equipment filters. Currently, if nothing is entered the filter is ignored whether negate is on or off. One might think about filtering all dives without tags, etc. instead. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-22 09:32:39 +01:00
this, &FilterWidget2::updateFilter);
Filter panel: add suit and notes search fields All the field in the Notes Panel of the main window are now supported. This needs some testing especially for the Notes field that may contain markup. It appears ok to me for single term searches. One would like to think about the default search option for the Notes. There is a vertical spacer in the Filter panel that I moved downwards and whose function I am not quite sure of. [Dirk Hohndel: small adjustments] Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-28 15:35:34 -08:00
connect(ui.suit, &QLineEdit::textChanged,
this, &FilterWidget2::updateFilter);
Cleanup: provide our own qOverload<> implementation. This is only in Qt 5.7 and therefore can't be used in Qt 5.5 and 5.6 builds. Moreover, we can't simply reuse Qt's version owing to licensing concerns. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-04 22:00:38 +02:00
connect(ui.suitMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
Filter panel: add suit and notes search fields All the field in the Notes Panel of the main window are now supported. This needs some testing especially for the Notes field that may contain markup. It appears ok to me for single term searches. One would like to think about the default search option for the Notes. There is a vertical spacer in the Filter panel that I moved downwards and whose function I am not quite sure of. [Dirk Hohndel: small adjustments] Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-28 15:35:34 -08:00
this, &FilterWidget2::updateFilter);
connect(ui.dnotes, &QLineEdit::textChanged,
this, &FilterWidget2::updateFilter);
connect(ui.dnotesMode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &FilterWidget2::updateFilter);
Coding style: unify connect() calls in filterwidget2.cpp The connect() calls had different styles. Unify them to the one that was used the most. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-22 09:38:57 +01:00
connect(ui.logged, &QCheckBox::stateChanged,
this, &FilterWidget2::updateLogged);
Filter for logged/planned dives Add filter for dives having a planned dive computer or a logged dive computer. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2019-01-01 18:49:56 +01:00
Coding style: unify connect() calls in filterwidget2.cpp The connect() calls had different styles. Unify them to the one that was used the most. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-22 09:38:57 +01:00
connect(ui.planned, &QCheckBox::stateChanged,
this, &FilterWidget2::updatePlanned);
Filter: support imperial units 1) Choose the correct conversion function for comparison. 2) Add a unit suffix to the fields. 3) Update the suffixes on change of preferences. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-20 21:01:00 +01:00
// Update temperature fields if user changes temperature-units in preferences.
Coding style: unify connect() calls in filterwidget2.cpp The connect() calls had different styles. Unify them to the one that was used the most. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-22 09:38:57 +01:00
connect(qPrefUnits::instance(), &qPrefUnits::temperatureChanged,
this, &FilterWidget2::temperatureChanged);
connect(qPrefUnits::instance(), &qPrefUnits::unit_systemChanged,
this, &FilterWidget2::temperatureChanged);
Filter: update counts if dives added / removed Update the filter counts if dives were added removed by the undo commands. The undo commands call into the filter model at the right time so that hidden_by_filter is already set. The filter model keeps track of the counts and emits a signal, which is caught by the widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 21:30:43 +01:00
Filter: implement reset filter Move initialization to a separate function and connect that to the reset button. Two points of note: 1) Reseting the text-fields causes signals. Thus, signals have to be ignored during reset. Do this with a new flag. 2) To make reset of the from-date work, the from-date has to be initialized to a distinct value. Setting a default-constructed QDateTime leaves the widget unchanged. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:11:30 +01:00
// Reset all fields.
clearFilter();
}
void FilterWidget2::clearFilter()
{
ignoreSignal = true; // Prevent signals to force filter recalculation
filterData = FilterData();
ui.minRating->setCurrentStars(filterData.minRating);
ui.maxRating->setCurrentStars(filterData.maxRating);
ui.minVisibility->setCurrentStars(filterData.minVisibility);
ui.maxVisibility->setCurrentStars(filterData.maxVisibility);
ui.minAirTemp->setValue(filterData.minAirTemp);
ui.maxAirTemp->setValue(filterData.maxAirTemp);
ui.minWaterTemp->setValue(filterData.minWaterTemp);
ui.maxWaterTemp->setValue(filterData.maxWaterTemp);
ui.planned->setChecked(filterData.logged);
ui.planned->setChecked(filterData.planned);
ui.people->clear();
ui.location->clear();
Filter panel: add suit and notes search fields All the field in the Notes Panel of the main window are now supported. This needs some testing especially for the Notes field that may contain markup. It appears ok to me for single term searches. One would like to think about the default search option for the Notes. There is a vertical spacer in the Filter panel that I moved downwards and whose function I am not quite sure of. [Dirk Hohndel: small adjustments] Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-28 15:35:34 -08:00
ui.suit->clear();
ui.dnotes->clear();
Filter: implement reset filter Move initialization to a separate function and connect that to the reset button. Two points of note: 1) Reseting the text-fields causes signals. Thus, signals have to be ignored during reset. Do this with a new flag. 2) To make reset of the from-date work, the from-date has to be initialized to a distinct value. Setting a default-constructed QDateTime leaves the widget unchanged. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:11:30 +01:00
ui.equipment->clear();
ui.tags->clear();
ui.fromDate->setDate(filterData.fromDate.date());
ui.fromTime->setTime(filterData.fromTime);
ui.toDate->setDate(filterData.toDate.date());
ui.toTime->setTime(filterData.toTime);
Filter: implement any-of mode Add an additional mode to the tags, people and location filters: any_of. Replace the original invert-bool by an enum. Move the common code into a distinct function. Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-02-19 16:31:21 +01:00
ui.tagsMode->setCurrentIndex((int)filterData.tagsMode);
ui.peopleMode->setCurrentIndex((int)filterData.peopleMode);
ui.locationMode->setCurrentIndex((int)filterData.locationMode);
Filter panel: add suit and notes search fields All the field in the Notes Panel of the main window are now supported. This needs some testing especially for the Notes field that may contain markup. It appears ok to me for single term searches. One would like to think about the default search option for the Notes. There is a vertical spacer in the Filter panel that I moved downwards and whose function I am not quite sure of. [Dirk Hohndel: small adjustments] Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-28 15:35:34 -08:00
ui.suitMode->setCurrentIndex((int)filterData.suitMode);
ui.dnotesMode->setCurrentIndex((int)filterData.dnotesMode);
Filter: implement any-of mode Add an additional mode to the tags, people and location filters: any_of. Replace the original invert-bool by an enum. Move the common code into a distinct function. Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-02-19 16:31:21 +01:00
ui.equipmentMode->setCurrentIndex((int)filterData.equipmentMode);
Desktop: set filter negation texts The texts may not be perfect, but this is a start. Replace the buttons by combo-boxes. This will allow potential extension to "any of". Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-01-26 14:02:09 -08:00
Filter: implement reset filter Move initialization to a separate function and connect that to the reset button. Two points of note: 1) Reseting the text-fields causes signals. Thus, signals have to be ignored during reset. Do this with a new flag. 2) To make reset of the from-date work, the from-date has to be initialized to a distinct value. Setting a default-constructed QDateTime leaves the widget unchanged. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:11:30 +01:00
ignoreSignal = false;
filterDataChanged(filterData);
Filter: support imperial units 1) Choose the correct conversion function for comparison. 2) Add a unit suffix to the fields. 3) Update the suffixes on change of preferences. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-20 21:01:00 +01:00
}
Filter: implement close & reset Implement the close & reset functionality, by reseting the application state to "Default". This is currently the only state from where the fiter can be called. To make it consistent with CTRL^F, clear the filter in the hide() slot, which is called in both cases. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:41:07 +01:00
void FilterWidget2::closeFilter()
{
Turn application state into enum The application state was encoded in a QByteArray. Thus, there was no compile-time checking. Typos would lead to silent failures. Turn the application state into an enum. Use the enum-class construct, so that the values don't polute the global namespace. Moreover, this makes them strongly typed, i.e. they don't auto-convert to integers. A disadvantage is that the enums now have to be cast to int explicitly when used to index an array. Replace two hash-maps in MainWindow to arrays of fixed sizes. Move the application-state details into their own files. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-05-10 19:51:43 +02:00
MainWindow::instance()->setApplicationState(ApplicationState::Default);
Filter: implement close & reset Implement the close & reset functionality, by reseting the application state to "Default". This is currently the only state from where the fiter can be called. To make it consistent with CTRL^F, clear the filter in the hide() slot, which is called in both cases. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:41:07 +01:00
}
Filter: support imperial units 1) Choose the correct conversion function for comparison. 2) Add a unit suffix to the fields. 3) Update the suffixes on change of preferences. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-20 21:01:00 +01:00
void FilterWidget2::temperatureChanged()
{
QString temp = get_temp_unit();
ui.minAirTemp->setSuffix(temp);
ui.maxAirTemp->setSuffix(temp);
ui.minWaterTemp->setSuffix(temp);
ui.maxWaterTemp->setSuffix(temp);
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
}
void FilterWidget2::updateFilter()
{
Filter: implement reset filter Move initialization to a separate function and connect that to the reset button. Two points of note: 1) Reseting the text-fields causes signals. Thus, signals have to be ignored during reset. Do this with a new flag. 2) To make reset of the from-date work, the from-date has to be initialized to a distinct value. Setting a default-constructed QDateTime leaves the widget unchanged. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-25 22:11:30 +01:00
if (ignoreSignal)
return;
Filter: update filterData directly without copying In FilterWidget2::updateFilter() a new FilterData object is generated and then copied onto the filterData member variable. Instead, modify filterData directly. This seems also more logical from a semantic point of view: Do we want to reset fields that were not set by the user? Contains trivial whitespace fix. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-12-16 20:43:01 +01:00
filterData.validFilter = true;
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
filterData.minVisibility = ui.minVisibility->currentStars();
filterData.maxVisibility = ui.maxVisibility->currentStars();
filterData.minRating = ui.minRating->currentStars();
filterData.maxRating = ui.maxRating->currentStars();
filterData.minWaterTemp = ui.minWaterTemp->value();
filterData.maxWaterTemp = ui.maxWaterTemp->value();
filterData.minAirTemp = ui.minAirTemp->value();
filterData.maxWaterTemp = ui.maxWaterTemp->value();
Desktop, Filter UI: make date/time consistent On all (most?) places we use separate date/time fields for the time of a dive, and we follow the setting from the preferences to format those. Make the new filter widget consistent, with respect to the to and from interval. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2019-01-20 17:00:56 +01:00
filterData.fromDate = ui.fromDate->dateTime();
filterData.fromTime = ui.fromTime->time();
filterData.toDate = ui.toDate->dateTime();
filterData.toTime = ui.toTime->time();
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
filterData.tags = ui.tags->text().split(",", QString::SkipEmptyParts);
filterData.people = ui.people->text().split(",", QString::SkipEmptyParts);
filterData.location = ui.location->text().split(",", QString::SkipEmptyParts);
Filter panel: add suit and notes search fields All the field in the Notes Panel of the main window are now supported. This needs some testing especially for the Notes field that may contain markup. It appears ok to me for single term searches. One would like to think about the default search option for the Notes. There is a vertical spacer in the Filter panel that I moved downwards and whose function I am not quite sure of. [Dirk Hohndel: small adjustments] Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-28 15:35:34 -08:00
filterData.suit = ui.suit->text().split(",", QString::SkipEmptyParts);
filterData.dnotes = ui.dnotes->text().split(",", QString::SkipEmptyParts);
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
filterData.equipment = ui.equipment->text().split(",", QString::SkipEmptyParts);
Filter: implement any-of mode Add an additional mode to the tags, people and location filters: any_of. Replace the original invert-bool by an enum. Move the common code into a distinct function. Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-02-19 16:31:21 +01:00
filterData.tagsMode = (FilterData::Mode)ui.tagsMode->currentIndex();
filterData.peopleMode = (FilterData::Mode)ui.peopleMode->currentIndex();
filterData.locationMode = (FilterData::Mode)ui.locationMode->currentIndex();
Filter panel: add suit and notes search fields All the field in the Notes Panel of the main window are now supported. This needs some testing especially for the Notes field that may contain markup. It appears ok to me for single term searches. One would like to think about the default search option for the Notes. There is a vertical spacer in the Filter panel that I moved downwards and whose function I am not quite sure of. [Dirk Hohndel: small adjustments] Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-28 15:35:34 -08:00
filterData.suitMode = (FilterData::Mode)ui.suitMode->currentIndex();
filterData.dnotesMode = (FilterData::Mode)ui.dnotesMode->currentIndex();
Filter: implement any-of mode Add an additional mode to the tags, people and location filters: any_of. Replace the original invert-bool by an enum. Move the common code into a distinct function. Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-02-19 16:31:21 +01:00
filterData.equipmentMode = (FilterData::Mode)ui.equipmentMode->currentIndex();
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
filterData.logged = ui.logged->isChecked();
filterData.planned = ui.planned->isChecked();
Struct FilterData The idea is that this struct will have all the needed data that will be passed to the filter model. Everything that happens on the filterwidget will fill out this struct, then forward it to the model, that in turn will activate the filter hiding some of the dives that matches on your divelist. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-12-06 20:07:47 +01:00
Filter: update filterData directly without copying In FilterWidget2::updateFilter() a new FilterData object is generated and then copied onto the filterData member variable. Instead, modify filterData directly. This seems also more logical from a semantic point of view: Do we want to reset fields that were not set by the user? Contains trivial whitespace fix. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-12-16 20:43:01 +01:00
filterDataChanged(filterData);
Handle Show / Close of the Filter Box when you close, remove filter. when you open again, restore. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-11-16 15:24:11 +01:00
}
Coding style: remove Java-style function definition Remove a few cases of void fun() { ... } While touching these functions, fix a few other whitespace coding style violations. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-02-23 18:31:02 +01:00
void FilterWidget2::updateLogged(int value)
{
Filter for logged/planned dives Add filter for dives having a planned dive computer or a logged dive computer. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2019-01-01 18:49:56 +01:00
if (value == Qt::Unchecked)
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
ui.planned->setChecked(true);
Filter for logged/planned dives Add filter for dives having a planned dive computer or a logged dive computer. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2019-01-01 18:49:56 +01:00
updateFilter();
}
Coding style: remove Java-style function definition Remove a few cases of void fun() { ... } While touching these functions, fix a few other whitespace coding style violations. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-02-23 18:31:02 +01:00
void FilterWidget2::updatePlanned(int value)
{
Filter for logged/planned dives Add filter for dives having a planned dive computer or a logged dive computer. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2019-01-01 18:49:56 +01:00
if (value == Qt::Unchecked)
Filter widget: make Ui class subobject of widget Commit 8e81d3f10087fa7ac600dcb18cfebf27716c4209 changed a bunch of Ui classes to be subobject of the widget. For consistency do the same with the filter widget. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-01-17 23:01:57 +01:00
ui.logged->setChecked(true);
Filter for logged/planned dives Add filter for dives having a planned dive computer or a logged dive computer. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2019-01-01 18:49:56 +01:00
updateFilter();
}
Handle Show / Close of the Filter Box when you close, remove filter. when you open again, restore. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-11-16 15:24:11 +01:00
void FilterWidget2::showEvent(QShowEvent *event)
{
QWidget::showEvent(event);
Filter: connect widget and filter In the latest version of the new filter-widget the connection between widget and filter was lost. Connect both - but use a simple function call instead of a signal, since it is not immediately obivous where the connection should be made. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-12-16 20:33:37 +01:00
filterDataChanged(filterData);
Handle Show / Close of the Filter Box when you close, remove filter. when you open again, restore. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-11-16 15:24:11 +01:00
}
void FilterWidget2::hideEvent(QHideEvent *event)
{
QWidget::hideEvent(event);
Filter: connect widget and filter In the latest version of the new filter-widget the connection between widget and filter was lost. Connect both - but use a simple function call instead of a signal, since it is not immediately obivous where the connection should be made. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-12-16 20:33:37 +01:00
}
void FilterWidget2::filterDataChanged(const FilterData &data)
{
Filter: split out filter from model Split out the actual filtering from the MultiFilterSortModel. Create a DiveFilter class that does the actual filtering. Currently, mobile and desktop have their own version of this class, though ultimately we may want to merge them. The idea here is that the trip-model and undo-commands have direct access to the filter-function and thus can take care of keeping track of the number of shown dives, etc. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-11-17 18:13:55 +01:00
DiveFilter::instance()->setFilter(data);
Desktop: show the filter information in the window title Instead of using the filter widget itself to show the information how many dives are displayed, put it in the window title where it's visible even if the filter widget isn't shown. If the filter is not active, simply show the total number of dives. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-18 12:47:20 -08:00
}
QString FilterWidget2::shownText()
{
if (isActive())
Filter: move number of shown dives to core We mark hidden/shown dives in the core but store the number of shown dives in the MultiFilterSortModel. Move this datum to the core for improved locality. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-11-17 16:23:00 +01:00
return tr("%L1/%L2 shown").arg(shown_dives).arg(dive_table.nr);
Desktop: show the filter information in the window title Instead of using the filter widget itself to show the information how many dives are displayed, put it in the window title where it's visible even if the filter widget isn't shown. If the filter is not active, simply show the total number of dives. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-18 12:47:20 -08:00
else
return tr("%L1 dives").arg(dive_table.nr);
Start to implement a simplified version of the filter widget The idea of this new widget is to be able to filter more types of data, while keeping it simple and extending the feature set to something that was impossible with the old implementation. While the old implementation had 4 panels that you could use to filter specific tags / people / types of dives the new one will let you filter by visibility, temperature people, name, equipment, etc, in a more natural way than the old one. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2018-10-13 11:52:08 +02:00
}
Desktop: track if the filter widget is active This is not perfect - if you open the filter, set some criterion and then remove it again (without resetting the filter), this variable will give you a false positive). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-18 12:43:34 -08:00
bool FilterWidget2::isActive() const
{
return filterData.validFilter;
}
Reference in a new issue Copy permalink