filter: connect new filtercode to filterwidget2

Replace the static filterwidget with a list of filterconstraints.
The first attempt of using a table widget failed, because Qt's
table delegates are dysfunctional. It's not that they are bad, they
just don't work at all.

Therefore, this code "simulates" a table in that on addition / deletion
of constraints it keeps track of the rows of all constraints so
that each constraint-widget can be associated with a row of the
constraint model.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

2 files changed, 18 insertions, 199 deletions

diff --git a/core/divefilter.cpp b/core/divefilter.cpp
index fae6c1760..e1aaf7bce 100644
--- a/core/divefilter.cpp
+++ b/core/divefilter.cpp
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include "divefilter.h"
-#include "divelist.h"
-#include "gettextfromc.h"
-#include "tag.h"
+#include "divelist.h" // for filter_dive
+#include "qthelper.h"
 #include "subsurface-qt/divelistnotifier.h"
 
 static void updateDiveStatus(dive *d, bool newStatus, ShownChange &change)
@@ -16,6 +15,9 @@ static void updateDiveStatus(dive *d, bool newStatus, ShownChange &change)
 	}
 }
 
+#ifdef SUBSURFACE_MOBILE
+
+#include "tag.h"
 static QStringList getTagList(const dive *d)
 {
 	QStringList res;
@@ -25,8 +27,6 @@ static QStringList getTagList(const dive *d)
 	return res;
 }
 
-#ifdef SUBSURFACE_MOBILE
-
 // Check if a string-list contains at least one string that starts with the second argument.
 // Comparison is non case sensitive and removes white space.
 static bool listContainsSuperstring(const QStringList &list, const QString &s)
@@ -140,10 +140,13 @@ void DiveFilter::setFilter(const FilterData &data)
 #include "desktop-widgets/mapwidget.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/divelistview.h"
-#include "core/trip.h"
-#include "core/divesite.h"
 #include "qt-models/filtermodels.h"
 
+bool FilterData::validFilter() const
+{
+	return fullText.doit() || !constraints.empty();
+}
+
 ShownChange DiveFilter::update(const QVector<dive *> &dives) const
 {
 	dive *old_current = current_dive;
@@ -191,96 +194,6 @@ ShownChange DiveFilter::updateAll() const
 	return res;
 }
 
-namespace {
-	// Pointer to function that takes two strings and returns whether
-	// the first matches the second according to a criterion (substring, starts-with, exact).
-	using StrCheck = bool (*) (const QString &s1, const QString &s2);
-
-	// Check if a string-list contains at least one string containing the second argument.
-	// Comparison is non case sensitive and removes white space.
-	bool listContainsSuperstring(const QStringList &list, const QString &s, StrCheck strchk)
-	{
-		return std::any_of(list.begin(), list.end(), [&s,strchk](const QString &s2)
-				   { return strchk(s2, s); } );
-	}
-
-	// 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, StringFilterMode stringMode)
-	{
-		bool negate = mode == FilterData::Mode::NONE_OF;
-		bool any_of = mode == FilterData::Mode::ANY_OF;
-		StrCheck strchk =
-			stringMode == StringFilterMode::SUBSTRING ?
-				[](const QString &s1, const QString &s2) { return s1.contains(s2, Qt::CaseInsensitive); } :
-			stringMode == StringFilterMode::STARTSWITH ?
-				[](const QString &s1, const QString &s2) { return s1.startsWith(s2, Qt::CaseInsensitive); } :
-			/* StringFilterMode::EXACT */
-				[](const QString &s1, const QString &s2) { return s1.compare(s2, Qt::CaseInsensitive) == 0; };
-		auto fun = [&list, negate, strchk](const QString &item)
-			   { return listContainsSuperstring(list, item, strchk) != 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, StringFilterMode stringMode)
-	{
-		if (tags.isEmpty())
-			return true;
-		return check(tags, getTagList(d), mode, stringMode);
-	}
-
-	bool hasPersons(const QStringList &people, const struct dive *d, FilterData::Mode mode, StringFilterMode stringMode)
-	{
-		if (people.isEmpty())
-			return true;
-		QStringList dive_people = QString(d->buddy).split(",", QString::SkipEmptyParts)
-			+ QString(d->divemaster).split(",", QString::SkipEmptyParts);
-		return check(people, dive_people, mode, stringMode);
-	}
-
-	bool hasLocations(const QStringList &locations, const struct dive *d, FilterData::Mode mode, StringFilterMode stringMode)
-	{
-		if (locations.isEmpty())
-			return true;
-		QStringList diveLocations;
-		if (d->divetrip)
-			diveLocations.push_back(QString(d->divetrip->location));
-
-		if (d->dive_site)
-			diveLocations.push_back(QString(d->dive_site->name));
-
-		return check(locations, diveLocations, mode, stringMode);
-	}
-
-	// TODO: Finish this implementation.
-	bool hasEquipment(const QStringList &, const struct dive *, FilterData::Mode, StringFilterMode)
-	{
-		return true;
-	}
-
-	bool hasSuits(const QStringList &suits, const struct dive *d, FilterData::Mode mode, StringFilterMode stringMode)
-	{
-		if (suits.isEmpty())
-			return true;
-		QStringList diveSuits;
-		if (d->suit)
-			diveSuits.push_back(QString(d->suit));
-		return check(suits, diveSuits, mode, stringMode);
-	}
-
-	bool hasNotes(const QStringList &dnotes, const struct dive *d, FilterData::Mode mode, StringFilterMode stringMode)
-	{
-		if (dnotes.isEmpty())
-			return true;
-		QStringList diveNotes;
-		if (d->notes)
-			diveNotes.push_back(QString(d->notes));
-		return check(dnotes, diveNotes, mode, stringMode);
-	}
-}
-
 DiveFilter *DiveFilter::instance()
 {
 	static DiveFilter self;
@@ -296,70 +209,11 @@ bool DiveFilter::showDive(const struct dive *d) const
 	if (d->invalid && !prefs.display_invalid_dives)
 		return false;
 
-	if (!filterData.validFilter)
+	if (!filterData.validFilter())
 		return true;
 
-	if (d->visibility < filterData.minVisibility || d->visibility > filterData.maxVisibility)
-		return false;
-
-	if (d->rating < filterData.minRating || d->rating > filterData.maxRating)
-		return false;
-
-	auto temp_comp = prefs.units.temperature == units::CELSIUS ? C_to_mkelvin : F_to_mkelvin;
-	if (d->watertemp.mkelvin &&
-	    (d->watertemp.mkelvin < (*temp_comp)(filterData.minWaterTemp) || d->watertemp.mkelvin > (*temp_comp)(filterData.maxWaterTemp)))
-		return false;
-
-	if (d->airtemp.mkelvin &&
-	    (d->airtemp.mkelvin < (*temp_comp)(filterData.minAirTemp) || d->airtemp.mkelvin > (*temp_comp)(filterData.maxAirTemp)))
-		return false;
-
-	QDateTime t = filterData.fromDate;
-	t.setTime(filterData.fromTime);
-	if (filterData.fromDate.isValid() && filterData.fromTime.isValid() &&
-	    d->when < t.toMSecsSinceEpoch()/1000 + t.offsetFromUtc())
-		return false;
-
-	t = filterData.toDate;
-	t.setTime(filterData.toTime);
-	if (filterData.toDate.isValid() && filterData.toTime.isValid() &&
-	    d->when > t.toMSecsSinceEpoch()/1000 + t.offsetFromUtc())
-		return false;
-
-	// tags.
-	if (!hasTags(filterData.tags, d, filterData.tagsMode, filterData.tagsStringMode))
-		return false;
-
-	// people
-	if (!hasPersons(filterData.people, d, filterData.peopleMode, filterData.peopleStringMode))
-		return false;
-
-	// Location
-	if (!hasLocations(filterData.location, d, filterData.locationMode, filterData.locationStringMode))
-		return false;
-
-	// Suit
-	if (!hasSuits(filterData.suit, d, filterData.suitMode, filterData.suitStringMode))
-		return false;
-
-	// Notes
-	if (!hasNotes(filterData.dnotes, d, filterData.dnotesMode, filterData.dnotesStringMode))
-		return false;
-
-	if (!hasEquipment(filterData.equipment, d, filterData.equipmentMode, filterData.equipmentStringMode))
-		return false;
-
-	// Planned/Logged
-	if (!filterData.logged && !has_planned(d, true))
-		return false;
-	if (!filterData.planned && !has_planned(d, false))
-		return false;
-
-	// Dive mode
-	if (filterData.diveMode >= 0 && d->dc.divemode != (divemode_t)filterData.diveMode)
-		return false;
-
-	return true;
+	return std::all_of(filterData.constraints.begin(), filterData.constraints.end(),
+			   [d] (const filter_constraint &c) { return filter_constraint_match_dive(c, d); });
 }
 
 void DiveFilter::startFilterDiveSites(QVector<dive_site *> ds)
diff --git a/core/divefilter.h b/core/divefilter.h
index 8a6384291..64f70676b 100644
--- a/core/divefilter.h
+++ b/core/divefilter.h
@@ -3,9 +3,11 @@
 #ifndef DIVE_FILTER_H
 #define DIVE_FILTER_H
 
+#include "fulltext.h"
+#include "filterconstraint.h"
+#include <vector>
 #include <QVector>
 #include <QStringList>
-#include "fulltext.h"
 
 struct dive;
 
@@ -50,8 +52,6 @@ private:
 
 #else
 
-#include <QDateTime>
-
 struct dive_trip;
 struct dive_site;
 
@@ -63,45 +63,10 @@ struct FilterData {
 		NONE_OF = 2
 	};
 
-	bool validFilter = false;
-	int minVisibility = 0;
-	int maxVisibility = 5;
-	int minRating = 0;
-	int maxRating = 5;
-	// The default minimum and maximum temperatures are set such that all
-	// physically reasonable dives are shown. Note that these values should
-	// work for both Celsius and Fahrenheit scales.
-	double minWaterTemp = -10;
-	double maxWaterTemp = 200;
-	double minAirTemp = -50;
-	double maxAirTemp = 200;
-	QDateTime fromDate = QDateTime(QDate(1980,1,1));
-	QTime fromTime = QTime(0,0);
-	QDateTime toDate = QDateTime::currentDateTime().addDays(7);
-	QTime toTime = QTime::currentTime();
-	QStringList tags;
-	QStringList people;
-	QStringList location;
-	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;
-	StringFilterMode dnotesStringMode = StringFilterMode::SUBSTRING;
-	StringFilterMode suitStringMode = StringFilterMode::SUBSTRING;
-	StringFilterMode equipmentStringMode = StringFilterMode::SUBSTRING;
-	bool logged = true;
-	bool planned = true;
-	int diveMode = -1; // -1: don't filter, >= 0: corresponds to divemode_t
+	std::vector<filter_constraint> constraints;
+	bool validFilter() const;
 };
 
 class DiveFilter {