mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-17 21:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Filter: implement any-of mode

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2019-02-19 16:31:21 +01:00 • committed by Dirk Hohndel
parent ce669adc53
commit e550a788f0
4 changed files with 66 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
desktop-widgets/filterwidget2.cpp
View file

@ -140,10 +140,10 @@ void FilterWidget2::clearFilter()
ui.fromTime->setTime(filterData.fromTime);
ui.toDate->setDate(filterData.toDate.date());
ui.toTime->setTime(filterData.toTime);
ui.tagsMode->setCurrentIndex(filterData.tagsNegate ? 1 : 0);
ui.peopleMode->setCurrentIndex(filterData.peopleNegate ? 1 : 0);
ui.locationMode->setCurrentIndex(filterData.locationNegate ? 1 : 0);
ui.equipmentMode->setCurrentIndex(filterData.equipmentNegate ? 1 : 0);
ui.tagsMode->setCurrentIndex((int)filterData.tagsMode);
ui.peopleMode->setCurrentIndex((int)filterData.peopleMode);
ui.locationMode->setCurrentIndex((int)filterData.locationMode);
ui.equipmentMode->setCurrentIndex((int)filterData.equipmentMode);
ignoreSignal = false;
@ -186,10 +186,10 @@ void FilterWidget2::updateFilter()
filterData.people = ui.people->text().split(",", QString::SkipEmptyParts);
filterData.location = ui.location->text().split(",", QString::SkipEmptyParts);
filterData.equipment = ui.equipment->text().split(",", QString::SkipEmptyParts);
filterData.tagsNegate = ui.tagsMode->currentIndex() == 1;
filterData.peopleNegate = ui.peopleMode->currentIndex() == 1;
filterData.locationNegate = ui.locationMode->currentIndex() == 1;
filterData.equipmentNegate = ui.equipmentMode->currentIndex() == 1;
filterData.tagsMode = (FilterData::Mode)ui.tagsMode->currentIndex();
filterData.peopleMode = (FilterData::Mode)ui.peopleMode->currentIndex();
filterData.locationMode = (FilterData::Mode)ui.locationMode->currentIndex();
filterData.equipmentMode = (FilterData::Mode)ui.equipmentMode->currentIndex();
filterData.logged = ui.logged->isChecked();
filterData.planned = ui.planned->isChecked();

24
desktop-widgets/filterwidget2.ui
View file

@ -298,6 +298,11 @@
<string>All of</string>
</property>
</item>
<item>
<property name="text">
<string>Any of</string>
</property>
</item>
<item>
<property name="text">
<string>None of</string>
@ -312,6 +317,11 @@
<string>All of</string>
</property>
</item>
<item>
<property name="text">
<string>Any of</string>
</property>
</item>
<item>
<property name="text">
<string>None of</string>
@ -323,12 +333,17 @@
<widget class="QComboBox" name="locationMode">
<item>
<property name="text">
<string>Matches</string>
<string>All of</string>
</property>
</item>
<item>
<property name="text">
<string>Doesn't match</string>
<string>Any of</string>
</property>
</item>
<item>
<property name="text">
<string>None of</string>
</property>
</item>
</widget>
@ -340,6 +355,11 @@
<string>All of</string>
</property>
</item>
<item>
<property name="text">
<string>Any of</string>
</property>
</item>
<item>
<property name="text">
<string>None of</string>

42
qt-models/filtermodels.cpp
View file

@ -24,28 +24,37 @@ namespace {
{ return s2.trimmed().contains(s.trimmed(), Qt::CaseInsensitive); } );
}
bool hasTags(const QStringList &tags, const struct dive *d, bool negate)
// Check whether either all, any or none of the items of the first list is
// in the second list as a super string.
// The mode is controlled by the second argument
bool check(const QStringList &items, const QStringList &list, FilterData::Mode mode)
{
bool negate = mode == FilterData::Mode::NONE_OF;
bool any_of = mode == FilterData::Mode::ANY_OF;
auto fun = [&list, negate](const QString &item)
{ return listContainsSuperstring(list, item) != negate; };
return any_of ? std::any_of(items.begin(), items.end(), fun)
: std::all_of(items.begin(), items.end(), fun);
}
bool hasTags(const QStringList &tags, const struct dive *d, FilterData::Mode mode)
{
if (tags.isEmpty())
return true;
QStringList dive_tags = get_taglist_string(d->tag_list).split(",");
return std::all_of(tags.begin(), tags.end(), [&dive_tags, negate](const QString &tag)
{ return listContainsSuperstring(dive_tags, tag) != negate; } );
return check(tags, dive_tags, mode);
}
bool hasPersons(const QStringList &people, const struct dive *d, bool negate)
bool hasPersons(const QStringList &people, const struct dive *d, FilterData::Mode mode)
{
if (people.isEmpty())
return true;
QStringList dive_people = QString(d->buddy).split(",", QString::SkipEmptyParts)
+ QString(d->divemaster).split(",", QString::SkipEmptyParts);
return std::all_of(people.begin(), people.end(), [&dive_people, negate](const QString &person)
{ return listContainsSuperstring(dive_people, person) != negate; } );
return check(people, dive_people, mode);
}
bool hasLocations(const QStringList &locations, const struct dive *d, bool negate)
bool hasLocations(const QStringList &locations, const struct dive *d, FilterData::Mode mode)
{
if (locations.isEmpty())
return true;
@ -56,12 +65,11 @@ namespace {
if (d->dive_site)
diveLocations.push_back(QString(d->dive_site->name));
return std::all_of(locations.begin(), locations.end(), [&diveLocations, negate](const QString &location)
{ return listContainsSuperstring(diveLocations, location) != negate; } );
return check(locations, diveLocations, mode);
}
// TODO: Finish this iimplementation.
bool hasEquipment(const QStringList &, const struct dive *, bool)
// TODO: Finish this implementation.
bool hasEquipment(const QStringList &, const struct dive *, FilterData::Mode)
{
return true;
}
@ -129,18 +137,18 @@ bool MultiFilterSortModel::showDive(const struct dive *d) const
return false;
// tags.
if (!hasTags(filterData.tags, d, filterData.tagsNegate))
if (!hasTags(filterData.tags, d, filterData.tagsMode))
return false;
// people
if (!hasPersons(filterData.people, d, filterData.peopleNegate))
if (!hasPersons(filterData.people, d, filterData.peopleMode))
return false;
// Location
if (!hasLocations(filterData.location, d, filterData.locationNegate))
if (!hasLocations(filterData.location, d, filterData.locationMode))
return false;
if (!hasEquipment(filterData.equipment, d, filterData.equipmentNegate))
if (!hasEquipment(filterData.equipment, d, filterData.equipmentMode))
return false;
// Planned/Logged

15
qt-models/filtermodels.h
View file

@ -15,6 +15,13 @@ struct dive;
struct dive_trip;
struct FilterData {
// The mode ids are chosen such that they can be directly converted from / to combobox indices.
enum class Mode {
ALL_OF = 0,
ANY_OF = 1,
NONE_OF = 2
};
bool validFilter = false;
int minVisibility = 0;
int maxVisibility = 5;
@ -35,10 +42,10 @@ struct FilterData {
QStringList people;
QStringList location;
QStringList equipment;
bool tagsNegate = false;
bool peopleNegate = false;
bool locationNegate = false;
bool equipmentNegate = false;
Mode tagsMode = Mode::ALL_OF;
Mode peopleMode = Mode::ALL_OF;
Mode locationMode = Mode::ALL_OF;
Mode equipmentMode = Mode::ALL_OF;
bool logged = true;
bool planned = true;
};