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

filter: connect fulltext filter to frontend

Browse source 
There are now three filter modes:
1) Dive site
2) Fulltext
3) Normal

When doing a fulltext search, get the dives that match the
fulltext filter and then apply the other filters on that list.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-16 22:31:06 +01:00 • committed by Dirk Hohndel
parent 68d6a75ea3
commit 2bd4c6f6ec
3 changed files with 46 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/divefilter.cpp
View file

@ -21,14 +21,14 @@ ShownChange DiveFilter::updateAll() const
#include "desktop-widgets/mapwidget.h"
#include "desktop-widgets/mainwindow.h"
#include "desktop-widgets/divelistview.h"
#include "core/fulltext.h"
#include "core/qthelper.h"
#include "core/trip.h"
#include "core/divesite.h"
#include "qt-models/filtermodels.h"
void DiveFilter::updateDiveStatus(dive *d, ShownChange &change) const
void DiveFilter::updateDiveStatus(dive *d, bool newStatus, ShownChange &change) const
{
bool newStatus = showDive(d);
if (filter_dive(d, newStatus)) {
if (newStatus)
change.newShown.push_back(d);
@ -40,9 +40,17 @@ void DiveFilter::updateDiveStatus(dive *d, ShownChange &change) const
ShownChange DiveFilter::update(const QVector<dive *> &dives) const
{
dive *old_current = current_dive;
ShownChange res;
for (dive *d: dives)
updateDiveStatus(d, res);
bool doDS = diveSiteMode();
bool doFullText = filterData.fullText.doit();
for (dive *d: dives) {
// There are three modes: divesite, fulltext, normal
bool newStatus = doDS ? dive_sites.contains(d->dive_site) :
doFullText ? fulltext_dive_matches(d, filterData.fullText, filterData.fulltextStringMode) && showDive(d) :
showDive(d);
updateDiveStatus(d, newStatus, res);
}
res.currentChanged = old_current != current_dive;
return res;
}
@ -50,9 +58,28 @@ ShownChange DiveFilter::update(const QVector<dive *> &dives) const
ShownChange DiveFilter::updateAll() const
{
dive *old_current = current_dive;
ShownChange res;
for (int i = 0; i < dive_table.nr; ++i)
updateDiveStatus(get_dive(i), res);
int i;
dive *d;
// There are three modes: divesite, fulltext, normal
if (diveSiteMode()) {
for_each_dive(i, d) {
bool newStatus = dive_sites.contains(d->dive_site);
updateDiveStatus(d, newStatus, res);
}
} else if (filterData.fullText.doit()) {
FullTextResult ft = fulltext_find_dives(filterData.fullText, filterData.fulltextStringMode);
for_each_dive(i, d) {
bool newStatus = ft.dive_matches(d) && showDive(d);
updateDiveStatus(d, newStatus, res);
}
} else {
for_each_dive(i, d) {
bool newStatus = showDive(d);
updateDiveStatus(d, newStatus, res);
}
}
res.currentChanged = old_current != current_dive;
return res;
}
@ -161,9 +188,6 @@ DiveFilter::DiveFilter() : diveSiteRefCount(0)
bool DiveFilter::showDive(const struct dive *d) const
{
if (diveSiteMode())
return dive_sites.contains(d->dive_site);
if (!filterData.validFilter)
return true;

11
core/divefilter.h
View file

@ -13,12 +13,6 @@ struct ShownChange {
bool currentChanged;
};
enum class StringFilterMode {
SUBSTRING = 0,
STARTSWITH = 1,
EXACT = 2
};
// The dive filter for mobile is currently much simpler than for desktop.
// Therefore, for now we have two completely separate implementations.
// This should be unified in the future.
@ -36,6 +30,7 @@ private:
#else
#include "fulltext.h"
#include <QDateTime>
#include <QStringList>
@ -72,12 +67,14 @@ struct FilterData {
QStringList suit;
QStringList dnotes;
QStringList equipment;
FullTextQuery fullText;
Mode tagsMode = Mode::ALL_OF;
Mode peopleMode = Mode::ALL_OF;
Mode locationMode = Mode::ANY_OF;
Mode dnotesMode = Mode::ALL_OF;
Mode suitMode = Mode::ANY_OF;
Mode equipmentMode = Mode::ALL_OF;
StringFilterMode fulltextStringMode = StringFilterMode::STARTSWITH;
StringFilterMode tagsStringMode = StringFilterMode::SUBSTRING;
StringFilterMode peopleStringMode = StringFilterMode::SUBSTRING;
StringFilterMode locationStringMode = StringFilterMode::SUBSTRING;
@ -102,7 +99,7 @@ public:
ShownChange updateAll() const; // Update filter status of all dives and return dives whose status changed
private:
DiveFilter();
void updateDiveStatus(dive *d, ShownChange &change) const;
void updateDiveStatus(dive *d, bool newStatus, ShownChange &change) const;
bool showDive(const struct dive *d) const; // Should that dive be shown?
QVector<dive_site *> dive_sites;

9
desktop-widgets/filterwidget2.cpp
View file

@ -78,6 +78,12 @@ FilterWidget2::FilterWidget2(QWidget* parent) :
connect(ui.toTime, &QDateTimeEdit::timeChanged,
this, &FilterWidget2::updateFilter);
connect(ui.fullText, &QLineEdit::textChanged,
this, &FilterWidget2::updateFilter);
connect(ui.fulltextStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &FilterWidget2::updateFilter);
connect(ui.tags, &QLineEdit::textChanged,
this, &FilterWidget2::updateFilter);
@ -170,6 +176,7 @@ void FilterWidget2::clearFilter()
ui.suitMode->setCurrentIndex((int)filterData.suitMode);
ui.dnotesMode->setCurrentIndex((int)filterData.dnotesMode);
ui.equipmentMode->setCurrentIndex((int)filterData.equipmentMode);
ui.fulltextStringMode->setCurrentIndex((int)filterData.fulltextStringMode);
ui.tagsStringMode->setCurrentIndex((int)filterData.tagsStringMode);
ui.peopleStringMode->setCurrentIndex((int)filterData.peopleStringMode);
ui.locationStringMode->setCurrentIndex((int)filterData.locationStringMode);
@ -214,6 +221,7 @@ void FilterWidget2::updateFilter()
filterData.fromTime = ui.fromTime->time();
filterData.toDate = ui.toDate->dateTime();
filterData.toTime = ui.toTime->time();
filterData.fullText = ui.fullText->text();
filterData.tags = ui.tags->text().split(",", QString::SkipEmptyParts);
filterData.people = ui.people->text().split(",", QString::SkipEmptyParts);
filterData.location = ui.location->text().split(",", QString::SkipEmptyParts);
@ -226,6 +234,7 @@ void FilterWidget2::updateFilter()
filterData.suitMode = (FilterData::Mode)ui.suitMode->currentIndex();
filterData.dnotesMode = (FilterData::Mode)ui.dnotesMode->currentIndex();
filterData.equipmentMode = (FilterData::Mode)ui.equipmentMode->currentIndex();
filterData.fulltextStringMode = (StringFilterMode)ui.fulltextStringMode->currentIndex();
filterData.tagsStringMode = (StringFilterMode)ui.tagsStringMode->currentIndex();
filterData.peopleStringMode = (StringFilterMode)ui.peopleStringMode->currentIndex();
filterData.locationStringMode = (StringFilterMode)ui.locationStringMode->currentIndex();