mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
b575069638
No idea why this code was there... but what it caused was an invalid access to checkState[-1] when a dive had that first tag. This explains why sometimes the dives that had that tag were shown, regardless of whether the selected filter criteria should have excluded them or not. Fixes #769 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
390 lines
10 KiB
C++
390 lines
10 KiB
C++
#include "filtermodels.h"
|
|
#include "dive.h"
|
|
#include "models.h"
|
|
#include "mainwindow.h"
|
|
#include "display.h"
|
|
|
|
#define CREATE_INSTANCE_METHOD( CLASS ) \
|
|
CLASS *CLASS::instance() \
|
|
{ \
|
|
static CLASS *self = new CLASS(); \
|
|
return self; \
|
|
}
|
|
|
|
#define CREATE_MODEL_SET_DATA_METHOD( CLASS ) \
|
|
bool CLASS::setData(const QModelIndex &index, const QVariant &value, int role) \
|
|
{ \
|
|
if (role == Qt::CheckStateRole) { \
|
|
checkState[index.row()] = value.toBool(); \
|
|
anyChecked = false; \
|
|
for (int i = 0; i < rowCount(); i++) { \
|
|
if (checkState[i] == true) { \
|
|
anyChecked = true; \
|
|
break; \
|
|
} \
|
|
} \
|
|
dataChanged(index, index); \
|
|
return true; \
|
|
} \
|
|
return false; \
|
|
}
|
|
|
|
#define CREATE_CLEAR_FILTER_METHOD( CLASS ) \
|
|
void CLASS::clearFilter() \
|
|
{ \
|
|
memset(checkState, false, rowCount()); \
|
|
checkState[rowCount() - 1] = false; \
|
|
anyChecked = false; \
|
|
emit dataChanged(createIndex(0,0), createIndex(rowCount()-1, 0)); \
|
|
}
|
|
|
|
#define CREATE_FLAGS_METHOD( CLASS ) \
|
|
Qt::ItemFlags CLASS::flags(const QModelIndex &index) const \
|
|
{ \
|
|
return QStringListModel::flags(index) | Qt::ItemIsUserCheckable; \
|
|
}
|
|
|
|
#define CREATE_DATA_METHOD( CLASS, COUNTER_FUNCTION ) \
|
|
QVariant CLASS::data(const QModelIndex &index, int role) const \
|
|
{ \
|
|
if (role == Qt::CheckStateRole) { \
|
|
return checkState[index.row()] ? Qt::Checked : Qt::Unchecked; \
|
|
} else if (role == Qt::DisplayRole) { \
|
|
QString value = stringList()[index.row()]; \
|
|
int count = COUNTER_FUNCTION((index.row() == rowCount() - 1) ? "" : value.toUtf8().data()); \
|
|
return value + QString(" (%1)").arg(count); \
|
|
} \
|
|
return QVariant(); \
|
|
}
|
|
|
|
#define CREATE_COMMON_METHODS_FOR_FILTER( CLASS, COUNTER_FUNCTION ) \
|
|
CREATE_FLAGS_METHOD( CLASS ); \
|
|
CREATE_CLEAR_FILTER_METHOD( CLASS ); \
|
|
CREATE_MODEL_SET_DATA_METHOD( CLASS ); \
|
|
CREATE_INSTANCE_METHOD( CLASS ); \
|
|
CREATE_DATA_METHOD( CLASS, COUNTER_FUNCTION )
|
|
|
|
CREATE_COMMON_METHODS_FOR_FILTER(TagFilterModel, count_dives_with_tag);
|
|
CREATE_COMMON_METHODS_FOR_FILTER(BuddyFilterModel, count_dives_with_person);
|
|
CREATE_COMMON_METHODS_FOR_FILTER(LocationFilterModel, count_dives_with_location);
|
|
CREATE_COMMON_METHODS_FOR_FILTER(SuitsFilterModel, count_dives_with_suit);
|
|
|
|
CREATE_INSTANCE_METHOD(MultiFilterSortModel);
|
|
|
|
SuitsFilterModel::SuitsFilterModel(QObject *parent) : QStringListModel(parent)
|
|
{
|
|
}
|
|
|
|
bool SuitsFilterModel::doFilter(dive *d, QModelIndex &index0, QAbstractItemModel *sourceModel) const
|
|
{
|
|
if (!anyChecked) {
|
|
return true;
|
|
}
|
|
|
|
// Checked means 'Show', Unchecked means 'Hide'.
|
|
QString suit(d->suit);
|
|
// only show empty suit dives if the user checked that.
|
|
if (suit.isEmpty()) {
|
|
if (rowCount() > 0)
|
|
return checkState[rowCount() - 1];
|
|
else
|
|
return true;
|
|
}
|
|
|
|
// there is a suit selected
|
|
QStringList suitList = stringList();
|
|
if (!suitList.isEmpty()) {
|
|
suitList.removeLast(); // remove the "Show Empty Suits";
|
|
for (int i = 0; i < rowCount(); i++) {
|
|
if (checkState[i] && (suit.indexOf(stringList()[i]) != -1)) {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void SuitsFilterModel::repopulate()
|
|
{
|
|
QStringList list;
|
|
struct dive *dive;
|
|
int i = 0;
|
|
for_each_dive (i, dive) {
|
|
QString suit(dive->suit);
|
|
if (!suit.isEmpty() && !list.contains(suit)) {
|
|
list.append(suit);
|
|
}
|
|
}
|
|
qSort(list);
|
|
list << tr("No suit set");
|
|
setStringList(list);
|
|
delete[] checkState;
|
|
checkState = new bool[list.count()];
|
|
memset(checkState, false, list.count());
|
|
checkState[list.count() - 1] = false;
|
|
anyChecked = false;
|
|
}
|
|
|
|
TagFilterModel::TagFilterModel(QObject *parent) : QStringListModel(parent)
|
|
{
|
|
}
|
|
|
|
void TagFilterModel::repopulate()
|
|
{
|
|
if (g_tag_list == NULL)
|
|
return;
|
|
QStringList list;
|
|
struct tag_entry *current_tag_entry = g_tag_list;
|
|
while (current_tag_entry != NULL) {
|
|
if (count_dives_with_tag(current_tag_entry->tag->name) > 0)
|
|
list.append(QString(current_tag_entry->tag->name));
|
|
current_tag_entry = current_tag_entry->next;
|
|
}
|
|
qSort(list);
|
|
list << tr("Empty tags");
|
|
setStringList(list);
|
|
delete[] checkState;
|
|
checkState = new bool[list.count()];
|
|
memset(checkState, false, list.count());
|
|
checkState[list.count() - 1] = false;
|
|
anyChecked = false;
|
|
}
|
|
|
|
bool TagFilterModel::doFilter(dive *d, QModelIndex &index0, QAbstractItemModel *sourceModel) const
|
|
{
|
|
// If there's nothing checked, this should show everything
|
|
if (!anyChecked) {
|
|
return true;
|
|
}
|
|
// Checked means 'Show', Unchecked means 'Hide'.
|
|
struct tag_entry *head = d->tag_list;
|
|
|
|
if (!head) { // last tag means "Show empty tags";
|
|
if (rowCount() > 0)
|
|
return checkState[rowCount() - 1];
|
|
else
|
|
return true;
|
|
}
|
|
|
|
// have at least one tag.
|
|
QStringList tagList = stringList();
|
|
if (!tagList.isEmpty()) {
|
|
tagList.removeLast(); // remove the "Show Empty Tags";
|
|
while (head) {
|
|
QString tagName(head->tag->name);
|
|
int index = tagList.indexOf(tagName);
|
|
if (checkState[index])
|
|
return true;
|
|
head = head->next;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
BuddyFilterModel::BuddyFilterModel(QObject *parent) : QStringListModel(parent)
|
|
{
|
|
}
|
|
|
|
bool BuddyFilterModel::doFilter(dive *d, QModelIndex &index0, QAbstractItemModel *sourceModel) const
|
|
{
|
|
// If there's nothing checked, this should show everything
|
|
if (!anyChecked) {
|
|
return true;
|
|
}
|
|
// Checked means 'Show', Unchecked means 'Hide'.
|
|
QString diveBuddy(d->buddy);
|
|
QString divemaster(d->divemaster);
|
|
// only show empty buddie dives if the user checked that.
|
|
if (diveBuddy.isEmpty() && divemaster.isEmpty()) {
|
|
if (rowCount() > 0)
|
|
return checkState[rowCount() - 1];
|
|
else
|
|
return true;
|
|
}
|
|
|
|
// have at least one buddy
|
|
QStringList buddyList = stringList();
|
|
if (!buddyList.isEmpty()) {
|
|
buddyList.removeLast(); // remove the "Show Empty Tags";
|
|
for (int i = 0; i < rowCount(); i++) {
|
|
if (checkState[i] && (diveBuddy.indexOf(stringList()[i]) != -1 || divemaster.indexOf(stringList()[i]) != -1)) {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void BuddyFilterModel::repopulate()
|
|
{
|
|
QStringList list;
|
|
struct dive *dive;
|
|
int i = 0;
|
|
for_each_dive (i, dive) {
|
|
QString persons = QString(dive->buddy) + "," + QString(dive->divemaster);
|
|
Q_FOREACH (const QString &person, persons.split(',', QString::SkipEmptyParts)) {
|
|
// Remove any leading spaces
|
|
if (!list.contains(person.trimmed())) {
|
|
list.append(person.trimmed());
|
|
}
|
|
}
|
|
}
|
|
qSort(list);
|
|
list << tr("No buddies");
|
|
setStringList(list);
|
|
delete[] checkState;
|
|
checkState = new bool[list.count()];
|
|
memset(checkState, false, list.count());
|
|
checkState[list.count() - 1] = false;
|
|
anyChecked = false;
|
|
}
|
|
|
|
LocationFilterModel::LocationFilterModel(QObject *parent) : QStringListModel(parent)
|
|
{
|
|
}
|
|
|
|
bool LocationFilterModel::doFilter(struct dive *d, QModelIndex &index0, QAbstractItemModel *sourceModel) const
|
|
{
|
|
if (!anyChecked) {
|
|
return true;
|
|
}
|
|
// Checked means 'Show', Unchecked means 'Hide'.
|
|
QString location(d->location);
|
|
// only show empty location dives if the user checked that.
|
|
if (location.isEmpty()) {
|
|
if (rowCount() > 0)
|
|
return checkState[rowCount() - 1];
|
|
else
|
|
return true;
|
|
}
|
|
|
|
// there is a location selected
|
|
QStringList locationList = stringList();
|
|
if (!locationList.isEmpty()) {
|
|
locationList.removeLast(); // remove the "Show Empty Tags";
|
|
for (int i = 0; i < rowCount(); i++) {
|
|
if (checkState[i] && (location.indexOf(stringList()[i]) != -1)) {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void LocationFilterModel::repopulate()
|
|
{
|
|
QStringList list;
|
|
struct dive *dive;
|
|
int i = 0;
|
|
for_each_dive (i, dive) {
|
|
QString location(dive->location);
|
|
if (!location.isEmpty() && !list.contains(location)) {
|
|
list.append(location);
|
|
}
|
|
}
|
|
qSort(list);
|
|
list << tr("No location set");
|
|
setStringList(list);
|
|
delete[] checkState;
|
|
checkState = new bool[list.count()];
|
|
memset(checkState, false, list.count());
|
|
checkState[list.count() - 1] = false;
|
|
anyChecked = false;
|
|
}
|
|
|
|
MultiFilterSortModel::MultiFilterSortModel(QObject *parent) : QSortFilterProxyModel(parent), justCleared(false)
|
|
{
|
|
}
|
|
|
|
bool MultiFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
|
|
{
|
|
if (justCleared || models.isEmpty())
|
|
return true;
|
|
|
|
bool shouldShow = true;
|
|
QModelIndex index0 = sourceModel()->index(source_row, 0, source_parent);
|
|
QVariant diveVariant = sourceModel()->data(index0, DiveTripModel::DIVE_ROLE);
|
|
struct dive *d = (struct dive *)diveVariant.value<void *>();
|
|
|
|
if (!d) { // It's a trip, only show the ones that have dives to be shown.
|
|
bool showTrip = false;
|
|
for (int i = 0; i < sourceModel()->rowCount(index0); i++) {
|
|
if (filterAcceptsRow(i, index0))
|
|
showTrip = true; // do not shortcircuit the loop or the counts will be wrong
|
|
}
|
|
return showTrip;
|
|
}
|
|
Q_FOREACH (MultiFilterInterface *model, models) {
|
|
if (!model->doFilter(d, index0, sourceModel()))
|
|
shouldShow = false;
|
|
}
|
|
|
|
filter_dive(d, shouldShow);
|
|
return shouldShow;
|
|
}
|
|
|
|
void MultiFilterSortModel::myInvalidate()
|
|
{
|
|
int i;
|
|
struct dive *d;
|
|
DiveListView *dlv = MainWindow::instance()->dive_list();
|
|
|
|
divesDisplayed = 0;
|
|
|
|
invalidate();
|
|
|
|
// first make sure the trips are no longer shown as selected
|
|
// (but without updating the selection state of the dives... this just cleans
|
|
// up an oddity in the filter handling)
|
|
// TODO: This should go internally to DiveList, to be triggered after a filter is due.
|
|
dlv->clearTripSelection();
|
|
|
|
// if we have no more selected dives, clean up the display - this later triggers us
|
|
// to pick one of the dives that are shown in the list as selected dive which is the
|
|
// natural behavior
|
|
if (amount_selected == 0) {
|
|
MainWindow::instance()->cleanUpEmpty();
|
|
} else {
|
|
// otherwise find the dives that should still be selected (the filter above unselected any
|
|
// dive that's no longer visible) and select them again
|
|
QList<int> curSelectedDives;
|
|
for_each_dive (i, d) {
|
|
if (d->selected)
|
|
curSelectedDives.append(get_divenr(d));
|
|
}
|
|
dlv->selectDives(curSelectedDives);
|
|
}
|
|
|
|
for_each_dive (i,d) {
|
|
if (!d->hidden_by_filter)
|
|
divesDisplayed++;
|
|
}
|
|
|
|
emit filterFinished();
|
|
}
|
|
|
|
void MultiFilterSortModel::addFilterModel(MultiFilterInterface *model)
|
|
{
|
|
QAbstractItemModel *itemModel = dynamic_cast<QAbstractItemModel *>(model);
|
|
Q_ASSERT(itemModel);
|
|
models.append(model);
|
|
connect(itemModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(myInvalidate()));
|
|
}
|
|
|
|
void MultiFilterSortModel::removeFilterModel(MultiFilterInterface *model)
|
|
{
|
|
QAbstractItemModel *itemModel = dynamic_cast<QAbstractItemModel *>(model);
|
|
Q_ASSERT(itemModel);
|
|
models.removeAll(model);
|
|
disconnect(itemModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(myInvalidate()));
|
|
}
|
|
|
|
void MultiFilterSortModel::clearFilter()
|
|
{
|
|
justCleared = true;
|
|
Q_FOREACH (MultiFilterInterface *iface, models) {
|
|
iface->clearFilter();
|
|
}
|
|
justCleared = false;
|
|
myInvalidate();
|
|
}
|