2017-04-27 18:25:32 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2016-04-05 05:02:03 +00:00
|
|
|
#include "qt-models/divetripmodel.h"
|
2018-10-19 11:33:35 +00:00
|
|
|
#include "qt-models/filtermodels.h"
|
2016-04-05 05:02:03 +00:00
|
|
|
#include "core/gettextfromc.h"
|
|
|
|
#include "core/metrics.h"
|
2019-05-31 14:09:14 +00:00
|
|
|
#include "core/trip.h"
|
2018-06-03 20:15:19 +00:00
|
|
|
#include "core/qthelper.h"
|
2018-05-11 15:25:41 +00:00
|
|
|
#include "core/subsurface-string.h"
|
2019-05-30 16:29:36 +00:00
|
|
|
#include "core/tag.h"
|
2015-06-29 17:39:12 +00:00
|
|
|
#include <QIcon>
|
2017-10-03 20:16:15 +00:00
|
|
|
#include <QDebug>
|
2018-12-27 09:06:11 +00:00
|
|
|
#include <memory>
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
|
|
// 1) Base functions
|
2015-05-28 21:33:51 +00:00
|
|
|
|
2018-10-14 06:56:53 +00:00
|
|
|
static int nitrox_sort_value(const struct dive *dive)
|
2015-05-28 21:33:51 +00:00
|
|
|
{
|
|
|
|
int o2, he, o2max;
|
|
|
|
get_dive_gas(dive, &o2, &he, &o2max);
|
|
|
|
return he * 1000 + o2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static QVariant dive_table_alignment(int column)
|
|
|
|
{
|
|
|
|
switch (column) {
|
2018-12-27 09:06:11 +00:00
|
|
|
case DiveTripModelBase::DEPTH:
|
|
|
|
case DiveTripModelBase::DURATION:
|
|
|
|
case DiveTripModelBase::TEMPERATURE:
|
|
|
|
case DiveTripModelBase::TOTALWEIGHT:
|
|
|
|
case DiveTripModelBase::SAC:
|
|
|
|
case DiveTripModelBase::OTU:
|
|
|
|
case DiveTripModelBase::MAXCNS:
|
2015-05-28 21:33:51 +00:00
|
|
|
// Right align numeric columns
|
2018-10-14 06:56:53 +00:00
|
|
|
return int(Qt::AlignRight | Qt::AlignVCenter);
|
|
|
|
// NR needs to be left aligned because its the indent marker for trips too
|
2018-12-27 09:06:11 +00:00
|
|
|
case DiveTripModelBase::NR:
|
|
|
|
case DiveTripModelBase::DATE:
|
|
|
|
case DiveTripModelBase::RATING:
|
|
|
|
case DiveTripModelBase::SUIT:
|
|
|
|
case DiveTripModelBase::CYLINDER:
|
|
|
|
case DiveTripModelBase::GAS:
|
|
|
|
case DiveTripModelBase::TAGS:
|
|
|
|
case DiveTripModelBase::PHOTOS:
|
|
|
|
case DiveTripModelBase::COUNTRY:
|
|
|
|
case DiveTripModelBase::BUDDIES:
|
|
|
|
case DiveTripModelBase::LOCATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return int(Qt::AlignLeft | Qt::AlignVCenter);
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
2018-10-14 06:56:53 +00:00
|
|
|
return QVariant();
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
QVariant DiveTripModelBase::tripData(const dive_trip *trip, int column, int role)
|
2015-05-28 21:33:51 +00:00
|
|
|
{
|
|
|
|
|
2018-10-14 06:56:53 +00:00
|
|
|
if (role == TRIP_ROLE)
|
2018-11-22 07:06:07 +00:00
|
|
|
return QVariant::fromValue(const_cast<dive_trip *>(trip)); // Not nice: casting away a const
|
2015-05-28 21:33:51 +00:00
|
|
|
|
|
|
|
if (role == Qt::DisplayRole) {
|
|
|
|
switch (column) {
|
2018-12-27 09:06:11 +00:00
|
|
|
case DiveTripModelBase::NR:
|
2015-05-28 21:33:51 +00:00
|
|
|
QString shownText;
|
2018-11-22 22:11:23 +00:00
|
|
|
bool oneDayTrip = trip_is_single_day(trip);
|
|
|
|
int countShown = trip_shown_dives(trip);
|
2018-11-08 15:58:33 +00:00
|
|
|
if (countShown < trip->dives.nr)
|
2015-10-08 09:02:42 +00:00
|
|
|
shownText = tr("(%1 shown)").arg(countShown);
|
2018-01-07 14:42:28 +00:00
|
|
|
if (!empty_string(trip->location))
|
2018-11-11 12:09:51 +00:00
|
|
|
return QString(trip->location) + ", " + get_trip_date_string(trip_date(trip), trip->dives.nr, oneDayTrip) + " "+ shownText;
|
2015-05-28 21:33:51 +00:00
|
|
|
else
|
2018-11-11 12:09:51 +00:00
|
|
|
return get_trip_date_string(trip_date(trip), trip->dives.nr, oneDayTrip) + shownText;
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-14 06:56:53 +00:00
|
|
|
return QVariant();
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
|
2018-07-22 10:21:58 +00:00
|
|
|
static const QString icon_names[4] = {
|
|
|
|
QStringLiteral(":zero"),
|
|
|
|
QStringLiteral(":photo-in-icon"),
|
|
|
|
QStringLiteral(":photo-out-icon"),
|
|
|
|
QStringLiteral(":photo-in-out-icon")
|
|
|
|
};
|
2015-05-28 21:33:51 +00:00
|
|
|
|
2018-10-14 06:56:53 +00:00
|
|
|
static int countPhotos(const struct dive *d)
|
|
|
|
{ // Determine whether dive has pictures, and whether they were taken during or before/after dive.
|
|
|
|
const int bufperiod = 120; // A 2-min buffer period. Photos within 2 min of dive are assumed as
|
|
|
|
int diveTotaltime = dive_endtime(d) - d->when; // taken during the dive, not before/after.
|
|
|
|
int pic_offset, icon_index = 0;
|
|
|
|
FOR_EACH_PICTURE (d) { // Step through each of the pictures for this dive:
|
|
|
|
pic_offset = picture->offset.seconds;
|
|
|
|
if ((pic_offset < -bufperiod) | (pic_offset > diveTotaltime+bufperiod)) {
|
|
|
|
icon_index |= 0x02; // If picture is before/after the dive
|
2019-05-15 14:42:14 +00:00
|
|
|
// then set the appropriate bit ...
|
|
|
|
} else {
|
2018-10-14 06:56:53 +00:00
|
|
|
icon_index |= 0x01; // else set the bit for picture during the dive
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return icon_index; // return value: 0=no pictures; 1=pictures during dive;
|
|
|
|
} // 2=pictures before/after; 3=pictures during as well as before/after
|
|
|
|
|
|
|
|
static QString displayDuration(const struct dive *d)
|
2015-05-28 21:33:51 +00:00
|
|
|
{
|
2018-10-14 06:56:53 +00:00
|
|
|
if (prefs.units.show_units_table)
|
|
|
|
return get_dive_duration_string(d->duration.seconds, gettextFromC::tr("h"), gettextFromC::tr("min"), "", ":", d->dc.divemode == FREEDIVE);
|
|
|
|
else
|
|
|
|
return get_dive_duration_string(d->duration.seconds, "", "", "", ":", d->dc.divemode == FREEDIVE);
|
|
|
|
}
|
2015-05-28 21:33:51 +00:00
|
|
|
|
2018-10-14 06:56:53 +00:00
|
|
|
static QString displayTemperature(const struct dive *d, bool units)
|
|
|
|
{
|
|
|
|
if (!d->watertemp.mkelvin)
|
|
|
|
return QString();
|
|
|
|
return get_temperature_string(d->watertemp, units);
|
|
|
|
}
|
|
|
|
|
|
|
|
static QString displaySac(const struct dive *d, bool units)
|
|
|
|
{
|
|
|
|
if (!d->sac)
|
|
|
|
return QString();
|
|
|
|
QString s = get_volume_string(d->sac, units);
|
|
|
|
return units ? s + gettextFromC::tr("/min") : s;
|
|
|
|
}
|
|
|
|
|
|
|
|
static QString displayWeight(const struct dive *d, bool units)
|
|
|
|
{
|
|
|
|
QString s = weight_string(total_weight(d));
|
|
|
|
if (!units)
|
|
|
|
return s;
|
|
|
|
else if (get_units()->weight == units::KG)
|
|
|
|
return s + gettextFromC::tr("kg");
|
|
|
|
else
|
|
|
|
return s + gettextFromC::tr("lbs");
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
QVariant DiveTripModelBase::diveData(const struct dive *d, int column, int role)
|
2018-10-14 06:56:53 +00:00
|
|
|
{
|
2015-05-28 21:33:51 +00:00
|
|
|
switch (role) {
|
|
|
|
case Qt::TextAlignmentRole:
|
2018-10-14 06:56:53 +00:00
|
|
|
return dive_table_alignment(column);
|
2015-05-28 21:33:51 +00:00
|
|
|
case Qt::DisplayRole:
|
|
|
|
switch (column) {
|
|
|
|
case NR:
|
2018-10-14 06:56:53 +00:00
|
|
|
return d->number;
|
2015-05-28 21:33:51 +00:00
|
|
|
case DATE:
|
2018-10-14 06:56:53 +00:00
|
|
|
return get_dive_date_string(d->when);
|
2015-05-28 21:33:51 +00:00
|
|
|
case DEPTH:
|
2018-10-14 06:56:53 +00:00
|
|
|
return get_depth_string(d->maxdepth, prefs.units.show_units_table);
|
2015-05-28 21:33:51 +00:00
|
|
|
case DURATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return displayDuration(d);
|
2015-05-28 21:33:51 +00:00
|
|
|
case TEMPERATURE:
|
2018-10-14 06:56:53 +00:00
|
|
|
return displayTemperature(d, prefs.units.show_units_table);
|
2015-05-28 21:33:51 +00:00
|
|
|
case TOTALWEIGHT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return displayWeight(d, prefs.units.show_units_table);
|
2015-05-28 21:33:51 +00:00
|
|
|
case SUIT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return QString(d->suit);
|
2015-05-28 21:33:51 +00:00
|
|
|
case CYLINDER:
|
2018-10-14 06:56:53 +00:00
|
|
|
return QString(d->cylinder[0].type.description);
|
2015-05-28 21:33:51 +00:00
|
|
|
case SAC:
|
2018-10-14 06:56:53 +00:00
|
|
|
return displaySac(d, prefs.units.show_units_table);
|
2015-05-28 21:33:51 +00:00
|
|
|
case OTU:
|
2018-10-14 06:56:53 +00:00
|
|
|
return d->otu;
|
2015-05-28 21:33:51 +00:00
|
|
|
case MAXCNS:
|
2017-10-09 06:46:18 +00:00
|
|
|
if (prefs.units.show_units_table)
|
2018-10-14 06:56:53 +00:00
|
|
|
return QString("%1%").arg(d->maxcns);
|
2017-10-09 06:46:18 +00:00
|
|
|
else
|
2018-10-14 06:56:53 +00:00
|
|
|
return d->maxcns;
|
2018-04-04 06:18:29 +00:00
|
|
|
case TAGS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return get_taglist_string(d->tag_list);
|
2016-11-19 12:23:54 +00:00
|
|
|
case PHOTOS:
|
|
|
|
break;
|
2017-10-02 15:52:07 +00:00
|
|
|
case COUNTRY:
|
2018-10-14 06:56:53 +00:00
|
|
|
return QString(get_dive_country(d));
|
2018-09-04 15:10:11 +00:00
|
|
|
case BUDDIES:
|
2018-10-14 06:56:53 +00:00
|
|
|
return QString(d->buddy);
|
2015-05-28 21:33:51 +00:00
|
|
|
case LOCATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return QString(get_dive_location(d));
|
2015-05-28 21:33:51 +00:00
|
|
|
case GAS:
|
2018-10-14 06:56:53 +00:00
|
|
|
char *gas_string = get_dive_gas_string(d);
|
|
|
|
QString ret(gas_string);
|
|
|
|
free(gas_string);
|
|
|
|
return ret;
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
break;
|
2015-06-29 17:39:12 +00:00
|
|
|
case Qt::DecorationRole:
|
2016-11-19 12:23:54 +00:00
|
|
|
switch (column) {
|
2017-10-02 15:52:07 +00:00
|
|
|
//TODO: ADD A FLAG
|
|
|
|
case COUNTRY:
|
2018-10-14 06:56:53 +00:00
|
|
|
return QVariant();
|
2016-11-19 12:23:54 +00:00
|
|
|
case LOCATION:
|
2018-09-06 20:15:37 +00:00
|
|
|
if (dive_has_gps_location(d)) {
|
2015-06-29 17:39:12 +00:00
|
|
|
IconMetrics im = defaultIconMetrics();
|
2018-10-14 06:56:53 +00:00
|
|
|
return QIcon(":globe-icon").pixmap(im.sz_small, im.sz_small);
|
2015-06-29 17:39:12 +00:00
|
|
|
}
|
2016-11-19 12:23:54 +00:00
|
|
|
break;
|
2016-11-21 09:26:58 +00:00
|
|
|
case PHOTOS:
|
2018-09-06 20:15:37 +00:00
|
|
|
if (d->picture_list)
|
2016-11-19 12:23:54 +00:00
|
|
|
{
|
|
|
|
IconMetrics im = defaultIconMetrics();
|
2018-10-14 06:56:53 +00:00
|
|
|
return QIcon(icon_names[countPhotos(d)]).pixmap(im.sz_small, im.sz_small);
|
2016-11-21 09:26:58 +00:00
|
|
|
} // If there are photos, show one of the three photo icons: fish= photos during dive;
|
|
|
|
break; // sun=photos before/after dive; sun+fish=photos during dive as well as before/after
|
2016-11-19 12:23:54 +00:00
|
|
|
}
|
2015-06-29 17:39:12 +00:00
|
|
|
break;
|
2015-05-28 21:33:51 +00:00
|
|
|
case Qt::ToolTipRole:
|
|
|
|
switch (column) {
|
|
|
|
case NR:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("#");
|
2015-05-28 21:33:51 +00:00
|
|
|
case DATE:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Date");
|
2015-05-28 21:33:51 +00:00
|
|
|
case RATING:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Rating");
|
2015-05-28 21:33:51 +00:00
|
|
|
case DEPTH:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Depth(%1)").arg((get_units()->length == units::METERS) ? tr("m") : tr("ft"));
|
2015-05-28 21:33:51 +00:00
|
|
|
case DURATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Duration");
|
2015-05-28 21:33:51 +00:00
|
|
|
case TEMPERATURE:
|
2019-05-11 20:45:49 +00:00
|
|
|
return tr("Temp.(°%1)").arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
|
2015-05-28 21:33:51 +00:00
|
|
|
case TOTALWEIGHT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs"));
|
2015-05-28 21:33:51 +00:00
|
|
|
case SUIT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Suit");
|
2015-05-28 21:33:51 +00:00
|
|
|
case CYLINDER:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Cylinder");
|
2015-05-28 21:33:51 +00:00
|
|
|
case GAS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Gas");
|
2015-05-28 21:33:51 +00:00
|
|
|
case SAC:
|
|
|
|
const char *unit;
|
|
|
|
get_volume_units(0, NULL, &unit);
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("SAC(%1)").arg(QString(unit).append(tr("/min")));
|
2015-05-28 21:33:51 +00:00
|
|
|
case OTU:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("OTU");
|
2015-05-28 21:33:51 +00:00
|
|
|
case MAXCNS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Max. CNS");
|
2018-04-04 06:18:29 +00:00
|
|
|
case TAGS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Tags");
|
2016-11-19 12:23:54 +00:00
|
|
|
case PHOTOS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Media before/during/after dive");
|
2017-10-02 15:52:07 +00:00
|
|
|
case COUNTRY:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Country");
|
2018-09-04 15:10:11 +00:00
|
|
|
case BUDDIES:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Buddy");
|
2015-05-28 21:33:51 +00:00
|
|
|
case LOCATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Location");
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
break;
|
2018-10-14 06:56:53 +00:00
|
|
|
case STAR_ROLE:
|
|
|
|
return d->rating;
|
|
|
|
case DIVE_ROLE:
|
2018-11-22 07:06:07 +00:00
|
|
|
return QVariant::fromValue(const_cast<dive *>(d)); // Not nice: casting away a const
|
2018-10-14 06:56:53 +00:00
|
|
|
case DIVE_IDX:
|
|
|
|
return get_divenr(d);
|
|
|
|
case SELECTED_ROLE:
|
|
|
|
return d->selected;
|
2016-11-21 09:26:58 +00:00
|
|
|
}
|
2018-10-14 06:56:53 +00:00
|
|
|
return QVariant();
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
QVariant DiveTripModelBase::headerData(int section, Qt::Orientation orientation, int role) const
|
2015-05-28 21:33:51 +00:00
|
|
|
{
|
|
|
|
if (orientation == Qt::Vertical)
|
2018-10-14 06:56:53 +00:00
|
|
|
return QVariant();
|
2015-05-28 21:33:51 +00:00
|
|
|
|
|
|
|
switch (role) {
|
|
|
|
case Qt::TextAlignmentRole:
|
2018-10-14 06:56:53 +00:00
|
|
|
return dive_table_alignment(section);
|
2015-05-28 21:33:51 +00:00
|
|
|
case Qt::FontRole:
|
2018-10-14 06:56:53 +00:00
|
|
|
return defaultModelFont();
|
2018-11-04 19:24:16 +00:00
|
|
|
case Qt::InitialSortOrderRole:
|
|
|
|
// By default, sort NR and DATE descending, everything else ascending.
|
|
|
|
return section == NR || section == DATE ? Qt::DescendingOrder : Qt::AscendingOrder;
|
2015-05-28 21:33:51 +00:00
|
|
|
case Qt::DisplayRole:
|
|
|
|
switch (section) {
|
|
|
|
case NR:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("#");
|
2015-05-28 21:33:51 +00:00
|
|
|
case DATE:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Date");
|
2015-05-28 21:33:51 +00:00
|
|
|
case RATING:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Rating");
|
2015-05-28 21:33:51 +00:00
|
|
|
case DEPTH:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Depth");
|
2015-05-28 21:33:51 +00:00
|
|
|
case DURATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Duration");
|
2015-05-28 21:33:51 +00:00
|
|
|
case TEMPERATURE:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Temp.");
|
2015-05-28 21:33:51 +00:00
|
|
|
case TOTALWEIGHT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Weight");
|
2015-05-28 21:33:51 +00:00
|
|
|
case SUIT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Suit");
|
2015-05-28 21:33:51 +00:00
|
|
|
case CYLINDER:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Cylinder");
|
2015-05-28 21:33:51 +00:00
|
|
|
case GAS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Gas");
|
2015-05-28 21:33:51 +00:00
|
|
|
case SAC:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("SAC");
|
2015-05-28 21:33:51 +00:00
|
|
|
case OTU:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("OTU");
|
2015-05-28 21:33:51 +00:00
|
|
|
case MAXCNS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Max CNS");
|
2018-04-04 06:18:29 +00:00
|
|
|
case TAGS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Tags");
|
2016-11-19 12:23:54 +00:00
|
|
|
case PHOTOS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Media");
|
2017-10-02 15:52:07 +00:00
|
|
|
case COUNTRY:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Country");
|
2018-09-04 15:10:11 +00:00
|
|
|
case BUDDIES:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Buddy");
|
2015-05-28 21:33:51 +00:00
|
|
|
case LOCATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Location");
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Qt::ToolTipRole:
|
|
|
|
switch (section) {
|
|
|
|
case NR:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("#");
|
2015-05-28 21:33:51 +00:00
|
|
|
case DATE:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Date");
|
2015-05-28 21:33:51 +00:00
|
|
|
case RATING:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Rating");
|
2015-05-28 21:33:51 +00:00
|
|
|
case DEPTH:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Depth(%1)").arg((get_units()->length == units::METERS) ? tr("m") : tr("ft"));
|
2015-05-28 21:33:51 +00:00
|
|
|
case DURATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Duration");
|
2015-05-28 21:33:51 +00:00
|
|
|
case TEMPERATURE:
|
2019-05-11 20:45:49 +00:00
|
|
|
return tr("Temp.(°%1)").arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
|
2015-05-28 21:33:51 +00:00
|
|
|
case TOTALWEIGHT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs"));
|
2015-05-28 21:33:51 +00:00
|
|
|
case SUIT:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Suit");
|
2015-05-28 21:33:51 +00:00
|
|
|
case CYLINDER:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Cylinder");
|
2015-05-28 21:33:51 +00:00
|
|
|
case GAS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Gas");
|
2015-05-28 21:33:51 +00:00
|
|
|
case SAC:
|
|
|
|
const char *unit;
|
|
|
|
get_volume_units(0, NULL, &unit);
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("SAC(%1)").arg(QString(unit).append(tr("/min")));
|
2015-05-28 21:33:51 +00:00
|
|
|
case OTU:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("OTU");
|
2015-05-28 21:33:51 +00:00
|
|
|
case MAXCNS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Max CNS");
|
2018-04-04 06:18:29 +00:00
|
|
|
case TAGS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Tags");
|
2016-11-19 12:23:54 +00:00
|
|
|
case PHOTOS:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Media before/during/after dive");
|
2018-09-04 15:10:11 +00:00
|
|
|
case BUDDIES:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Buddy");
|
2015-05-28 21:33:51 +00:00
|
|
|
case LOCATION:
|
2018-10-14 06:56:53 +00:00
|
|
|
return tr("Location");
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2018-10-14 06:56:53 +00:00
|
|
|
return QVariant();
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
static std::unique_ptr<DiveTripModelBase> currentModel;
|
|
|
|
DiveTripModelBase *DiveTripModelBase::instance()
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
if (!currentModel)
|
|
|
|
resetModel(TREE);
|
|
|
|
return currentModel.get();
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
void DiveTripModelBase::resetModel(DiveTripModelBase::Layout layout)
|
2018-09-30 14:06:17 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
if (layout == TREE)
|
|
|
|
currentModel.reset(new DiveTripModelTree);
|
|
|
|
else
|
|
|
|
currentModel.reset(new DiveTripModelList);
|
2018-09-30 14:06:17 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
DiveTripModelBase::DiveTripModelBase(QObject *parent) : QAbstractItemModel(parent)
|
2018-09-30 14:06:17 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
int DiveTripModelBase::columnCount(const QModelIndex&) const
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
return COLUMNS;
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
Qt::ItemFlags DiveTripModelBase::flags(const QModelIndex &index) const
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
dive *d = diveOrNull(index);
|
|
|
|
Qt::ItemFlags base = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
|
|
|
|
|
|
|
|
// Only dives have editable fields and only the number is editable
|
|
|
|
return d && index.column() == NR ? base | Qt::ItemIsEditable : base;
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
bool DiveTripModelBase::setData(const QModelIndex &index, const QVariant &value, int role)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
if (role == SHOWN_ROLE)
|
|
|
|
return setShown(index, value.value<bool>());
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// We only support setting of data for dives and there, only the number.
|
|
|
|
dive *d = diveOrNull(index);
|
|
|
|
if (!d)
|
|
|
|
return false;
|
|
|
|
if (role != Qt::EditRole)
|
|
|
|
return false;
|
|
|
|
if (index.column() != NR)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
int v = value.toInt();
|
|
|
|
if (v == 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Only accept numbers that are not already in use by other dives.
|
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
|
|
|
for_each_dive (i, dive) {
|
|
|
|
if (dive->number == v)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
d->number = v;
|
|
|
|
mark_divelist_changed(true);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
// Find a range of matching elements in a vector.
|
|
|
|
// Input parameters:
|
|
|
|
// v: vector to be searched
|
|
|
|
// first: first element to search
|
|
|
|
// cond: a function that is fed elements and returns an integer:
|
|
|
|
// - >0: matches
|
|
|
|
// - 0: doesn't match
|
|
|
|
// - <0: stop searching, no more elements will be found
|
|
|
|
// cond is called exactly once per element and from the beginning of the range.
|
|
|
|
// Returns a pair [first, last) with usual C++ semantics: last-first is the size of the found range.
|
|
|
|
// If no items were found, first and last are set to the size of the vector.
|
|
|
|
template <typename Vector, typename Predicate>
|
|
|
|
std::pair<int, int> findRangeIf(const Vector &v, int first, Predicate cond)
|
|
|
|
{
|
|
|
|
int size = (int)v.size();
|
|
|
|
for (int i = first; i < size; ++i) {
|
|
|
|
int res = cond(v[i]);
|
|
|
|
if (res > 0) {
|
|
|
|
for (int j = i + 1; j < size; ++j) {
|
|
|
|
if (cond(v[j]) <= 0)
|
|
|
|
return { i, j };
|
|
|
|
}
|
|
|
|
return { i, size };
|
|
|
|
} else if (res < 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return { size, size };
|
|
|
|
}
|
|
|
|
|
|
|
|
// Ideally, Qt's model/view functions are processed in batches of contiguous
|
|
|
|
// items. Therefore, this template is used to process actions on ranges of
|
|
|
|
// contiguous elements of a vector.
|
|
|
|
// Input paremeters:
|
|
|
|
// - items: vector to process, wich must allow random access via [] and the size() function
|
|
|
|
// - cond: a predicate that is tested for each element. contiguous ranges of elements which
|
|
|
|
// test for true are collected. cond is fed an element and should return:
|
|
|
|
// - >0: matches
|
|
|
|
// - 0: doesn't match
|
|
|
|
// - <0: stop searching, no more elements will be found
|
|
|
|
// - action: action that is called with the vector, first and last element of the range.
|
|
|
|
template<typename Vector, typename Predicate, typename Action>
|
|
|
|
void processRanges(Vector &items, Predicate cond, Action action)
|
|
|
|
{
|
|
|
|
// Note: the "i++" is correct: We know that the last element tested
|
|
|
|
// negatively -> we can skip it. Thus we avoid checking any element
|
|
|
|
// twice.
|
|
|
|
for(int i = 0;; i++) {
|
|
|
|
std::pair<int,int> range = findRangeIf(items, i, cond);
|
|
|
|
if (range.first >= (int)items.size())
|
|
|
|
break;
|
|
|
|
int delta = action(items, range.first, range.second);
|
|
|
|
i = range.second + delta;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// processRangesZip() is a refined version of processRanges(), which operates on two vectors.
|
|
|
|
// The vectors are supposed to be sorted equivalently. That is, the first matching
|
|
|
|
// item will of the first vector will match to the first item of the second vector.
|
|
|
|
// It is supposed that all elements of the second vector will match to an element of
|
|
|
|
// the first vector.
|
|
|
|
// Input parameters:
|
|
|
|
// - items1: vector to process, wich must allow random access via [] and the size() function
|
|
|
|
// - items2: second vector to process. every item in items2 must match to an item in items1
|
|
|
|
// in ascending order.
|
|
|
|
// - cond1: a predicate that is tested for each element of items1 with the next unmatched element
|
|
|
|
// of items2. returns a boolean
|
|
|
|
// - action: action that is called with the vectors, first and last element of the first range
|
|
|
|
// and first element of the last range.
|
|
|
|
template<typename Vector1, typename Vector2, typename Predicate, typename Action>
|
|
|
|
void processRangesZip(Vector1 &items1, Vector2 &items2, Predicate cond, Action action)
|
|
|
|
{
|
|
|
|
int actItem = 0;
|
|
|
|
processRanges(items1,
|
|
|
|
[&](typename Vector1::const_reference &e) mutable -> int { // Condition. Marked mutable so that it can change actItem
|
|
|
|
if (actItem >= items2.size())
|
|
|
|
return -1; // No more items -> bail
|
|
|
|
if (!cond(e, items2[actItem]))
|
|
|
|
return 0;
|
|
|
|
++actItem;
|
|
|
|
return 1;
|
|
|
|
},
|
|
|
|
[&](Vector1 &v1, int from, int to) { // Action
|
|
|
|
return action(v1, items2, from, to, actItem);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// Add items from vector "v2" to vector "v1" in batches of contiguous objects.
|
|
|
|
// The items are inserted at places according to a sort order determined by "comp".
|
|
|
|
// "v1" and "v2" are supposed to be ordered accordingly.
|
|
|
|
// TODO: We might use binary search with std::lower_bound(), but not sure if it's worth it.
|
|
|
|
// Input parameters:
|
|
|
|
// - v1: destination vector
|
|
|
|
// - v2: source vector
|
|
|
|
// - comp: compare-function, which is fed elements from v2 and v1. returns true for "insert here".
|
|
|
|
// - adder: performs the insertion. Perameters: v1, v2, insertion index, from, to range in v2.
|
|
|
|
template <typename Vector1, typename Vector2, typename Comparator, typename Inserter>
|
|
|
|
void addInBatches(Vector1 &v1, const Vector2 &v2, Comparator comp, Inserter insert)
|
2015-05-28 21:33:51 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
int idx = 0; // Index where dives will be inserted
|
|
|
|
int i, j; // Begin and end of range to insert
|
|
|
|
for (i = 0; i < (int)v2.size(); i = j) {
|
|
|
|
for (; idx < (int)v1.size() && !comp(v2[i], v1[idx]); ++idx)
|
|
|
|
; // Pass
|
|
|
|
|
|
|
|
// We found the index of the first item to add.
|
|
|
|
// Now search how many items we should insert there.
|
|
|
|
if (idx == (int)v1.size()) {
|
|
|
|
// We were at end -> insert the remaining items
|
|
|
|
j = v2.size();
|
|
|
|
} else {
|
|
|
|
for (j = i + 1; j < (int)v2.size() && comp(v2[j], v1[idx]); ++j)
|
|
|
|
; // Pass
|
|
|
|
}
|
2015-05-28 21:33:51 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// Now add the batch
|
|
|
|
insert(v1, v2, idx, i, j);
|
|
|
|
|
|
|
|
// Skip over inserted dives for searching the new insertion position plus one.
|
|
|
|
// If we added at the end, the loop will end anyway.
|
|
|
|
idx += j - i + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 2) TreeModel functions
|
|
|
|
|
|
|
|
DiveTripModelTree::DiveTripModelTree(QObject *parent) : DiveTripModelBase(parent)
|
|
|
|
{
|
|
|
|
// Stay informed of changes to the divelist
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesAdded, this, &DiveTripModelTree::divesAdded);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesDeleted, this, &DiveTripModelTree::divesDeleted);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &DiveTripModelTree::divesChanged);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesMovedBetweenTrips, this, &DiveTripModelTree::divesMovedBetweenTrips);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesTimeChanged, this, &DiveTripModelTree::divesTimeChanged);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesSelected, this, &DiveTripModelTree::divesSelected);
|
2019-02-24 22:02:22 +00:00
|
|
|
connect(&diveListNotifier, &DiveListNotifier::tripChanged, this, &DiveTripModelTree::tripChanged);
|
2018-12-27 09:06:11 +00:00
|
|
|
|
|
|
|
// Fill model
|
2018-11-06 20:48:18 +00:00
|
|
|
for (int i = 0; i < dive_table.nr ; ++i) {
|
2018-09-30 14:06:17 +00:00
|
|
|
dive *d = get_dive(i);
|
|
|
|
update_cylinder_related_info(d);
|
|
|
|
dive_trip_t *trip = d->divetrip;
|
2015-05-28 21:33:51 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// If this dive doesn't have a trip, add as top-level item.
|
|
|
|
if (!trip) {
|
2018-09-30 14:06:17 +00:00
|
|
|
items.emplace_back(d);
|
2015-05-28 21:33:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2018-09-30 14:06:17 +00:00
|
|
|
// Check if that trip is already known to us: search for the first item
|
2018-11-10 08:07:42 +00:00
|
|
|
// that corresponds to that trip
|
2018-09-30 14:06:17 +00:00
|
|
|
auto it = std::find_if(items.begin(), items.end(), [trip](const Item &item)
|
2018-11-10 08:07:42 +00:00
|
|
|
{ return item.d_or_t.trip == trip; });
|
2018-09-30 14:06:17 +00:00
|
|
|
if (it == items.end()) {
|
|
|
|
// We didn't find an entry for this trip -> add one
|
|
|
|
items.emplace_back(trip, d);
|
|
|
|
} else {
|
|
|
|
// We found the trip -> simply add the dive
|
|
|
|
it->dives.push_back(d);
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
}
|
2018-12-27 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int DiveTripModelTree::rowCount(const QModelIndex &parent) const
|
|
|
|
{
|
|
|
|
// No parent means top level - return the number of top-level items
|
|
|
|
if (!parent.isValid())
|
|
|
|
return items.size();
|
|
|
|
|
|
|
|
// If the parent has a parent, this is a dive -> no entries
|
|
|
|
if (parent.parent().isValid())
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
// If this is outside of our top-level list -> no entries
|
|
|
|
int row = parent.row();
|
|
|
|
if (row < 0 || row >= (int)items.size())
|
|
|
|
return 0;
|
2015-05-28 21:33:51 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// Only trips have items
|
|
|
|
const Item &entry = items[parent.row()];
|
|
|
|
return entry.d_or_t.trip ? entry.dives.size() : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const quintptr noParent = ~(quintptr)0; // This is the "internalId" marker for top-level item
|
|
|
|
|
|
|
|
QModelIndex DiveTripModelTree::index(int row, int column, const QModelIndex &parent) const
|
|
|
|
{
|
|
|
|
if (!hasIndex(row, column, parent))
|
|
|
|
return QModelIndex();
|
|
|
|
|
|
|
|
// In the "internalId", we store either ~0 for top-level items or the
|
|
|
|
// index of the parent item. A top-level item has an invalid parent.
|
|
|
|
return createIndex(row, column, parent.isValid() ? parent.row() : noParent);
|
|
|
|
}
|
|
|
|
|
|
|
|
QModelIndex DiveTripModelTree::parent(const QModelIndex &index) const
|
|
|
|
{
|
|
|
|
if (!index.isValid())
|
|
|
|
return QModelIndex();
|
|
|
|
|
|
|
|
// In the "internalId", we store either ~0 for top-level items
|
|
|
|
// or the index of the parent item.
|
|
|
|
quintptr id = index.internalId();
|
|
|
|
if (id == noParent)
|
|
|
|
return QModelIndex();
|
|
|
|
|
|
|
|
// Parent must be top-level item
|
|
|
|
return createIndex(id, 0, noParent);
|
|
|
|
}
|
|
|
|
|
|
|
|
DiveTripModelTree::Item::Item(dive_trip *t, const QVector<dive *> &divesIn) : d_or_t{nullptr, t},
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
dives(divesIn.toStdVector()),
|
|
|
|
shown(std::any_of(dives.begin(), dives.end(), [](dive *d){ return !d->hidden_by_filter; }))
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
DiveTripModelTree::Item::Item(dive_trip *t, dive *d) : d_or_t{nullptr, t},
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
dives({ d }),
|
|
|
|
shown(!d->hidden_by_filter)
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
DiveTripModelTree::Item::Item(dive *d) : d_or_t{d, nullptr},
|
|
|
|
shown(!d->hidden_by_filter)
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool DiveTripModelTree::Item::isDive(const dive *d) const
|
|
|
|
{
|
|
|
|
return d_or_t.dive == d;
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
dive *DiveTripModelTree::Item::getDive() const
|
2015-05-28 21:33:51 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
return d_or_t.dive;
|
2015-05-28 21:33:51 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
timestamp_t DiveTripModelTree::Item::when() const
|
|
|
|
{
|
|
|
|
return d_or_t.trip ? trip_date(d_or_t.trip) : d_or_t.dive->when;
|
|
|
|
}
|
|
|
|
|
|
|
|
dive_or_trip DiveTripModelTree::tripOrDive(const QModelIndex &index) const
|
2018-09-30 14:06:17 +00:00
|
|
|
{
|
|
|
|
if (!index.isValid())
|
|
|
|
return { nullptr, nullptr };
|
|
|
|
|
|
|
|
QModelIndex parent = index.parent();
|
|
|
|
// An invalid parent means that we're at the top-level
|
2018-11-10 08:07:42 +00:00
|
|
|
if (!parent.isValid())
|
|
|
|
return items[index.row()].d_or_t;
|
2018-09-30 14:06:17 +00:00
|
|
|
|
|
|
|
// Otherwise, we're at a leaf -> thats a dive
|
2018-11-10 08:07:42 +00:00
|
|
|
return { items[parent.row()].dives[index.row()], nullptr };
|
2018-09-30 14:06:17 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
dive *DiveTripModelTree::diveOrNull(const QModelIndex &index) const
|
2018-09-30 14:06:17 +00:00
|
|
|
{
|
2018-11-10 08:07:42 +00:00
|
|
|
return tripOrDive(index).dive;
|
2018-09-30 14:06:17 +00:00
|
|
|
}
|
|
|
|
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
// Set the shown flag that marks whether an entry is shown or hidden by the filter.
|
|
|
|
// The flag is cached for top-level items (trips and dives outside of trips).
|
|
|
|
// For dives that belong to a trip (i.e. non-top-level items), the flag is
|
|
|
|
// simply written through to the core.
|
|
|
|
bool DiveTripModelTree::setShown(const QModelIndex &idx, bool shown)
|
|
|
|
{
|
|
|
|
if (!idx.isValid())
|
|
|
|
return false;
|
|
|
|
|
|
|
|
QModelIndex parent = idx.parent();
|
|
|
|
if (!parent.isValid()) {
|
|
|
|
// An invalid parent means that we're at the top-level
|
|
|
|
Item &item = items[idx.row()];
|
|
|
|
item.shown = shown; // Cache the flag.
|
|
|
|
if (item.d_or_t.dive) {
|
|
|
|
// This is a dive -> also register the flag in the core
|
|
|
|
filter_dive(item.d_or_t.dive, shown);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// We're not at the top-level. This must be a dive, therefore
|
|
|
|
// simply write the flag through to the core.
|
|
|
|
const Item &parentItem = items[parent.row()];
|
|
|
|
filter_dive(parentItem.dives[idx.row()], shown);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
QVariant DiveTripModelTree::data(const QModelIndex &index, int role) const
|
2018-09-30 14:06:17 +00:00
|
|
|
{
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
if (role == SHOWN_ROLE) {
|
|
|
|
QModelIndex parent = index.parent();
|
|
|
|
// An invalid parent means that we're at the top-level
|
|
|
|
if (!parent.isValid())
|
|
|
|
return items[index.row()].shown;
|
|
|
|
return !items[parent.row()].dives[index.row()]->hidden_by_filter;
|
|
|
|
}
|
|
|
|
|
2018-09-30 14:06:17 +00:00
|
|
|
// Set the font for all items alike
|
|
|
|
if (role == Qt::FontRole)
|
|
|
|
return defaultModelFont();
|
|
|
|
|
2018-11-10 08:07:42 +00:00
|
|
|
dive_or_trip entry = tripOrDive(index);
|
|
|
|
if (entry.trip)
|
|
|
|
return tripData(entry.trip, index.column(), role);
|
|
|
|
else if (entry.dive)
|
|
|
|
return diveData(entry.dive, index.column(), role);
|
2018-09-30 14:06:17 +00:00
|
|
|
else
|
|
|
|
return QVariant();
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// After a trip changed, the top level might need to be reordered.
|
|
|
|
// Move the item and send a "data-changed" signal.
|
|
|
|
void DiveTripModelTree::topLevelChanged(int idx)
|
2018-11-13 08:26:53 +00:00
|
|
|
{
|
|
|
|
if (idx < 0 || idx >= (int)items.size())
|
|
|
|
return;
|
|
|
|
|
|
|
|
// First, try to move backwards
|
|
|
|
int newIdx = idx;
|
|
|
|
while (newIdx > 0 && dive_or_trip_less_than(items[idx].d_or_t, items[newIdx - 1].d_or_t))
|
|
|
|
--newIdx;
|
|
|
|
|
|
|
|
// If that didn't change, try to move forward
|
|
|
|
if (newIdx == idx) {
|
2018-11-26 21:08:29 +00:00
|
|
|
++newIdx;
|
|
|
|
while (newIdx < (int)items.size() && !dive_or_trip_less_than(items[idx].d_or_t, items[newIdx].d_or_t))
|
2018-11-13 08:26:53 +00:00
|
|
|
++newIdx;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If index changed, move items
|
2018-11-26 21:08:29 +00:00
|
|
|
if (newIdx != idx && newIdx != idx + 1) {
|
2018-11-13 08:26:53 +00:00
|
|
|
beginMoveRows(QModelIndex(), idx, idx, QModelIndex(), newIdx);
|
|
|
|
moveInVector(items, idx, idx + 1, newIdx);
|
|
|
|
endMoveRows();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finally, inform UI of changed trip header
|
|
|
|
QModelIndex tripIdx = createIndex(newIdx, 0, noParent);
|
|
|
|
dataChanged(tripIdx, tripIdx);
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
void DiveTripModelTree::addDivesToTrip(int trip, const QVector<dive *> &dives)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
2018-11-10 12:02:46 +00:00
|
|
|
// Construct the parent index, ie. the index of the trip.
|
|
|
|
QModelIndex parent = createIndex(trip, 0, noParent);
|
|
|
|
|
|
|
|
addInBatches(items[trip].dives, dives,
|
|
|
|
[](dive *d, dive *d2) { return dive_less_than(d, d2); }, // comp
|
|
|
|
[&](std::vector<dive *> &items, const QVector<dive *> &dives, int idx, int from, int to) { // inserter
|
|
|
|
beginInsertRows(parent, idx, idx + to - from - 1);
|
|
|
|
items.insert(items.begin() + idx, dives.begin() + from, dives.begin() + to);
|
|
|
|
endInsertRows();
|
|
|
|
});
|
2018-11-13 08:26:53 +00:00
|
|
|
|
|
|
|
// If necessary, move the trip
|
|
|
|
topLevelChanged(trip);
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
int DiveTripModelTree::findTripIdx(const dive_trip *trip) const
|
|
|
|
{
|
|
|
|
for (int i = 0; i < (int)items.size(); ++i)
|
|
|
|
if (items[i].d_or_t.trip == trip)
|
|
|
|
return i;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DiveTripModelTree::findDiveIdx(const dive *d) const
|
|
|
|
{
|
|
|
|
for (int i = 0; i < (int)items.size(); ++i)
|
|
|
|
if (items[i].isDive(d))
|
|
|
|
return i;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DiveTripModelTree::findDiveInTrip(int tripIdx, const dive *d) const
|
|
|
|
{
|
|
|
|
const Item &item = items[tripIdx];
|
|
|
|
for (int i = 0; i < (int)item.dives.size(); ++i)
|
|
|
|
if (item.dives[i] == d)
|
|
|
|
return i;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DiveTripModelTree::findInsertionIndex(const dive_trip *trip) const
|
|
|
|
{
|
|
|
|
dive_or_trip d_or_t{ nullptr, (dive_trip *)trip };
|
|
|
|
for (int i = 0; i < (int)items.size(); ++i) {
|
|
|
|
if (dive_or_trip_less_than(d_or_t, items[i].d_or_t))
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return items.size();
|
|
|
|
}
|
|
|
|
|
2018-08-26 12:42:38 +00:00
|
|
|
// This function is used to compare a dive to an arbitrary entry (dive or trip).
|
|
|
|
// For comparing two dives, use the core function dive_less_than_entry, which
|
|
|
|
// effectively sorts by timestamp.
|
|
|
|
// If comparing to a trip, the policy for equal-times is to place the dives
|
|
|
|
// before the trip in the case of equal timestamps.
|
2018-12-27 09:06:11 +00:00
|
|
|
bool DiveTripModelTree::dive_before_entry(const dive *d, const Item &entry)
|
2018-08-26 12:42:38 +00:00
|
|
|
{
|
2018-11-10 08:07:42 +00:00
|
|
|
dive_or_trip d_or_t { (dive *)d, nullptr };
|
|
|
|
return dive_or_trip_less_than(d_or_t, entry.d_or_t);
|
2018-08-26 12:42:38 +00:00
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
void DiveTripModelTree::divesAdded(dive_trip *trip, bool addTrip, const QVector<dive *> &dives)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
if (!trip) {
|
|
|
|
// This is outside of a trip. Add dives at the top-level in batches.
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
addInBatches(items, dives,
|
2018-08-26 12:42:38 +00:00
|
|
|
&dive_before_entry, // comp
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
[&](std::vector<Item> &items, const QVector<dive *> &dives, int idx, int from, int to) { // inserter
|
|
|
|
beginInsertRows(QModelIndex(), idx, idx + to - from - 1);
|
|
|
|
items.insert(items.begin() + idx, dives.begin() + from, dives.begin() + to);
|
|
|
|
endInsertRows();
|
|
|
|
});
|
|
|
|
} else if (addTrip) {
|
|
|
|
// We're supposed to add the whole trip. Just insert the trip.
|
2018-11-11 12:09:51 +00:00
|
|
|
int idx = findInsertionIndex(trip); // Find the place where to insert the trip
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
beginInsertRows(QModelIndex(), idx, idx);
|
|
|
|
items.insert(items.begin() + idx, { trip, dives });
|
|
|
|
endInsertRows();
|
|
|
|
} else {
|
|
|
|
// Ok, we have to add dives to an existing trip
|
|
|
|
// Find the trip...
|
|
|
|
int idx = findTripIdx(trip);
|
|
|
|
if (idx < 0) {
|
|
|
|
// We don't know the trip - this shouldn't happen. We seem to have
|
|
|
|
// missed some signals!
|
2018-12-27 09:06:11 +00:00
|
|
|
qWarning() << "DiveTripModelTree::divesAdded(): unknown trip";
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// ...and add dives.
|
|
|
|
addDivesToTrip(idx, dives);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
void DiveTripModelTree::divesDeleted(dive_trip *trip, bool deleteTrip, const QVector<dive *> &dives)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
if (!trip) {
|
|
|
|
// This is outside of a trip. Delete top-level dives in batches.
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
processRangesZip(items, dives,
|
|
|
|
[](const Item &e, dive *d) { return e.getDive() == d; }, // Condition
|
|
|
|
[&](std::vector<Item> &items, const QVector<dive *> &, int from, int to, int) -> int { // Action
|
|
|
|
beginRemoveRows(QModelIndex(), from, to - 1);
|
|
|
|
items.erase(items.begin() + from, items.begin() + to);
|
|
|
|
endRemoveRows();
|
|
|
|
return from - to; // Delta: negate the number of items deleted
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
// Find the trip
|
|
|
|
int idx = findTripIdx(trip);
|
|
|
|
if (idx < 0) {
|
|
|
|
// We don't know the trip - this shouldn't happen. We seem to have
|
|
|
|
// missed some signals!
|
2018-12-27 09:06:11 +00:00
|
|
|
qWarning() << "DiveTripModelTree::divesDeleted(): unknown trip";
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (deleteTrip) {
|
|
|
|
// We're supposed to delete the whole trip. Nice, we don't have to
|
|
|
|
// care about individual dives. Just remove the row.
|
|
|
|
beginRemoveRows(QModelIndex(), idx, idx);
|
|
|
|
items.erase(items.begin() + idx);
|
|
|
|
endRemoveRows();
|
|
|
|
} else {
|
|
|
|
// Construct the parent index, ie. the index of the trip.
|
|
|
|
QModelIndex parent = createIndex(idx, 0, noParent);
|
|
|
|
|
|
|
|
// Delete a number of dives in a trip. We do this range-wise.
|
|
|
|
processRangesZip(items[idx].dives, dives,
|
|
|
|
[](dive *d1, dive *d2) { return d1 == d2; }, // Condition
|
|
|
|
[&](std::vector<dive *> &diveList, const QVector<dive *> &, int from, int to, int) -> int { // Action
|
|
|
|
beginRemoveRows(parent, from, to - 1);
|
|
|
|
diveList.erase(diveList.begin() + from, diveList.begin() + to);
|
|
|
|
endRemoveRows();
|
|
|
|
return from - to; // Delta: negate the number of items deleted
|
|
|
|
});
|
|
|
|
|
2018-11-13 08:26:53 +00:00
|
|
|
// If necessary, move the trip
|
|
|
|
topLevelChanged(idx);
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-23 07:22:26 +00:00
|
|
|
// The tree-version of the model wants to process the dives per trip.
|
|
|
|
// This template takes a vector of dives and calls a function batchwise for each trip.
|
|
|
|
template<typename Function>
|
|
|
|
void processByTrip(QVector<dive *> dives, Function action)
|
|
|
|
{
|
|
|
|
// Sort lexicographically by trip then according to the dive_less_than() function.
|
|
|
|
std::sort(dives.begin(), dives.end(), [](const dive *d1, const dive *d2)
|
|
|
|
{ return d1->divetrip == d2->divetrip ? dive_less_than(d1, d2) : d1->divetrip < d2->divetrip; });
|
|
|
|
|
|
|
|
// Then, process the dives in batches by trip
|
|
|
|
int i, j; // Begin and end of batch
|
|
|
|
for (i = 0; i < dives.size(); i = j) {
|
|
|
|
dive_trip *trip = dives[i]->divetrip;
|
|
|
|
for (j = i + 1; j < dives.size() && dives[j]->divetrip == trip; ++j)
|
|
|
|
; // pass
|
|
|
|
// Copy dives into a QVector. Some sort of "range_view" would be ideal.
|
|
|
|
QVector<dive *> divesInTrip(j - i);
|
|
|
|
for (int k = i; k < j; ++k)
|
|
|
|
divesInTrip[k - i] = dives[k];
|
|
|
|
|
|
|
|
// Finally, emit the signal
|
|
|
|
action(trip, divesInTrip);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DiveTripModelTree::divesChanged(const QVector<dive *> &dives)
|
|
|
|
{
|
|
|
|
processByTrip(dives, [this] (dive_trip *trip, const QVector<dive *> &divesInTrip)
|
|
|
|
{ divesChangedTrip(trip, divesInTrip); });
|
|
|
|
}
|
|
|
|
|
|
|
|
void DiveTripModelTree::divesChangedTrip(dive_trip *trip, const QVector<dive *> &dives)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
2019-03-22 19:55:05 +00:00
|
|
|
// Update filter flags. TODO: The filter should update the flag by itself when
|
|
|
|
// recieving the signals below.
|
|
|
|
bool diveChanged = false;
|
|
|
|
for (dive *d: dives)
|
|
|
|
diveChanged |= MultiFilterSortModel::instance()->updateDive(d);
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
if (!trip) {
|
|
|
|
// This is outside of a trip. Process top-level items range-wise.
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
|
|
|
|
// Since we know that the dive list is sorted, we will only ever search for the first element
|
|
|
|
// in dives as this must be the first that we encounter. Once we find a range, increase the
|
|
|
|
// index accordingly.
|
|
|
|
processRangesZip(items, dives,
|
|
|
|
[](const Item &e, dive *d) { return e.getDive() == d; }, // Condition
|
|
|
|
[&](const std::vector<Item> &, const QVector<dive *> &, int from, int to, int) -> int { // Action
|
|
|
|
// TODO: We might be smarter about which columns changed!
|
|
|
|
dataChanged(createIndex(from, 0, noParent), createIndex(to - 1, COLUMNS - 1, noParent));
|
|
|
|
return 0; // No items added or deleted
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
// Find the trip.
|
|
|
|
int idx = findTripIdx(trip);
|
|
|
|
if (idx < 0) {
|
|
|
|
// We don't know the trip - this shouldn't happen. We seem to have
|
|
|
|
// missed some signals!
|
2018-12-27 09:06:11 +00:00
|
|
|
qWarning() << "DiveTripModelTree::divesChanged(): unknown trip";
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Change the dives in the trip. We do this range-wise.
|
|
|
|
processRangesZip(items[idx].dives, dives,
|
2018-12-27 09:06:11 +00:00
|
|
|
[](const dive *d1, const dive *d2) { return d1 == d2; }, // Condition (std::equal_to only in C++14)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
[&](const std::vector<dive *> &, const QVector<dive *> &, int from, int to, int) -> int { // Action
|
|
|
|
// TODO: We might be smarter about which columns changed!
|
|
|
|
dataChanged(createIndex(from, 0, idx), createIndex(to - 1, COLUMNS - 1, idx));
|
|
|
|
return 0; // No items added or deleted
|
|
|
|
});
|
2018-11-13 08:26:53 +00:00
|
|
|
|
|
|
|
// If necessary, move the trip
|
|
|
|
topLevelChanged(idx);
|
2019-03-22 19:55:05 +00:00
|
|
|
|
|
|
|
// If a dive changed, re-render the trip in the list [or actually make it (in)visible].
|
|
|
|
if (diveChanged)
|
|
|
|
dataChanged(createIndex(idx, 0, noParent), createIndex(idx, 0, noParent));
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-24 22:02:22 +00:00
|
|
|
void DiveTripModelTree::tripChanged(dive_trip *trip, TripField)
|
|
|
|
{
|
|
|
|
int idx = findTripIdx(trip);
|
|
|
|
if (idx < 0) {
|
|
|
|
// We don't know the trip - this shouldn't happen. We seem to have
|
|
|
|
// missed some signals!
|
|
|
|
qWarning() << "DiveTripModelTree::divesChanged(): unknown trip";
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dataChanged(createIndex(idx, 0, noParent), createIndex(idx, COLUMNS - 1, noParent));
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
static QVector<dive *> filterSelectedDives(const QVector<dive *> &dives)
|
2018-08-25 14:42:35 +00:00
|
|
|
{
|
|
|
|
QVector<dive *> res;
|
|
|
|
res.reserve(dives.size());
|
|
|
|
for (dive *d: dives)
|
|
|
|
if (d->selected)
|
|
|
|
res.append(d);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
void DiveTripModelTree::divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
|
|
|
// Move dives between trips. This is an "interesting" problem, as we might
|
|
|
|
// move from trip to trip, from trip to top-level or from top-level to trip.
|
|
|
|
// Moreover, we might have to add a trip first or delete an old trip.
|
2019-06-23 07:22:26 +00:00
|
|
|
// For simplicity, we will simply use the already existing divesAdded() / divesDeleted()
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
// functions. This *is* cheating. But let's just try this and see how graceful
|
|
|
|
// this is handled by Qt and if it gives some ugly UI behavior!
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// But first let's just rule out the trivial case: same-to-same trip move.
|
|
|
|
if (from == to)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
// Cheating!
|
2018-08-25 14:42:35 +00:00
|
|
|
// Unfortunately, removing the dives means that their selection is lost.
|
|
|
|
// Thus, remember the selection and re-add it later.
|
|
|
|
QVector<dive *> selectedDives = filterSelectedDives(dives);
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
divesAdded(to, createTo, dives);
|
|
|
|
divesDeleted(from, deleteFrom, dives);
|
2019-06-23 07:22:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DiveTripModelTree::divesTimeChanged(timestamp_t delta, const QVector<dive *> &dives)
|
|
|
|
{
|
|
|
|
processByTrip(dives, [this, delta] (dive_trip *trip, const QVector<dive *> &divesInTrip)
|
|
|
|
{ divesTimeChangedTrip(trip, delta, divesInTrip); });
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
|
|
|
|
2019-06-23 07:22:26 +00:00
|
|
|
void DiveTripModelTree::divesTimeChangedTrip(dive_trip *trip, timestamp_t delta, const QVector<dive *> &dives)
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
{
|
|
|
|
// As in the case of divesMovedBetweenTrips(), this is a tricky, but solvable, problem.
|
|
|
|
// We have to consider the direction (delta < 0 or delta >0) and that dives at their destination
|
|
|
|
// position have different contiguous batches than at their original position. For now,
|
|
|
|
// cheat and simply do a remove/add pair. Note that for this to work it is crucial the the
|
2018-12-27 09:06:11 +00:00
|
|
|
// order of the dives don't change. This is indeed the case, as all starting-times were
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
// moved by the same delta.
|
|
|
|
|
|
|
|
// Cheating!
|
2018-08-25 14:42:35 +00:00
|
|
|
// Unfortunately, removing the dives means that their selection is lost.
|
|
|
|
// Thus, remember the selection and re-add it later.
|
|
|
|
QVector<dive *> selectedDives = filterSelectedDives(dives);
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
divesDeleted(trip, false, dives);
|
|
|
|
divesAdded(trip, false, dives);
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
}
|
|
|
|
|
2019-06-23 10:46:42 +00:00
|
|
|
void DiveTripModelTree::divesSelected(const QVector<dive *> &dives, dive *current)
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
{
|
|
|
|
// We got a number of dives that have been selected. Turn this into QModelIndexes and
|
|
|
|
// emit a signal, so that views can change the selection.
|
|
|
|
QVector<QModelIndex> indexes;
|
|
|
|
indexes.reserve(dives.count());
|
|
|
|
|
2019-06-23 09:13:41 +00:00
|
|
|
processByTrip(dives, [this, &indexes] (dive_trip *trip, const QVector<dive *> &divesInTrip)
|
|
|
|
{ divesSelectedTrip(trip, divesInTrip, indexes); });
|
|
|
|
|
|
|
|
emit selectionChanged(indexes);
|
2019-06-23 10:46:42 +00:00
|
|
|
|
|
|
|
// The current dive has changed. Transform the current dive into an index and pass it on to the view.
|
|
|
|
if (!current) {
|
|
|
|
emit newCurrentDive(QModelIndex()); // No current dive -> tell view to clear current index with an invalid index
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dive_trip *trip = current->divetrip;
|
|
|
|
if (!trip) {
|
|
|
|
// Outside of a trip - search top-level.
|
|
|
|
int idx = findDiveIdx(current);
|
|
|
|
if (idx < 0) {
|
|
|
|
// We don't know this dive. Something is wrong. Warn and bail.
|
|
|
|
qWarning() << "DiveTripModelTree::diveSelected(): unknown top-level dive";
|
|
|
|
emit newCurrentDive(QModelIndex());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
emit newCurrentDive(createIndex(idx, 0, noParent));
|
|
|
|
} else {
|
|
|
|
int idx = findTripIdx(trip);
|
|
|
|
if (idx < 0) {
|
|
|
|
// We don't know the trip - this shouldn't happen. Warn and bail.
|
|
|
|
qWarning() << "DiveTripModelTree::diveSelected(): unknown trip";
|
|
|
|
emit newCurrentDive(QModelIndex());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
int diveIdx = findDiveInTrip(idx, current);
|
|
|
|
if (diveIdx < 0) {
|
|
|
|
// We don't know this dive. Something is wrong. Warn and bail.
|
|
|
|
qWarning() << "DiveTripModelTree::diveSelected(): unknown dive";
|
|
|
|
emit newCurrentDive(QModelIndex());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
emit newCurrentDive(createIndex(diveIdx, 0, idx));
|
|
|
|
}
|
2019-06-23 09:13:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DiveTripModelTree::divesSelectedTrip(dive_trip *trip, const QVector<dive *> &dives, QVector<QModelIndex> &indexes)
|
|
|
|
{
|
2018-12-27 09:06:11 +00:00
|
|
|
if (!trip) {
|
|
|
|
// This is at the top level.
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
// Since both lists are sorted, we can do this linearly. Perhaps a binary search
|
|
|
|
// would be better?
|
|
|
|
int j = 0; // Index in items array
|
|
|
|
for (int i = 0; i < dives.size(); ++i) {
|
|
|
|
while (j < (int)items.size() && !items[j].isDive(dives[i]))
|
|
|
|
++j;
|
|
|
|
if (j >= (int)items.size())
|
|
|
|
break;
|
|
|
|
indexes.append(createIndex(j, 0, noParent));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Find the trip.
|
|
|
|
int idx = findTripIdx(trip);
|
|
|
|
if (idx < 0) {
|
|
|
|
// We don't know the trip - this shouldn't happen. We seem to have
|
|
|
|
// missed some signals!
|
2019-06-23 09:13:41 +00:00
|
|
|
qWarning() << "DiveTripModelTree::diveSelectedTrip(): unknown trip";
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Locate the indices inside the trip.
|
|
|
|
// Since both lists are sorted, we can do this linearly. Perhaps a binary search
|
|
|
|
// would be better?
|
|
|
|
int j = 0; // Index in items array
|
|
|
|
const Item &entry = items[idx];
|
|
|
|
for (int i = 0; i < dives.size(); ++i) {
|
|
|
|
while (j < (int)entry.dives.size() && entry.dives[j] != dives[i])
|
|
|
|
++j;
|
|
|
|
if (j >= (int)entry.dives.size())
|
|
|
|
break;
|
|
|
|
indexes.append(createIndex(j, 0, idx));
|
|
|
|
}
|
|
|
|
}
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
}
|
2018-08-14 13:12:21 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
void DiveTripModelTree::filterFinished()
|
2018-10-19 11:33:35 +00:00
|
|
|
{
|
|
|
|
// If the filter finished, update all trip items to show the correct number of displayed dives
|
|
|
|
// in each trip. Without doing this, only trip headers of expanded trips were updated.
|
|
|
|
for (int idx = 0; idx < (int)items.size(); ++idx) {
|
|
|
|
QModelIndex tripIndex = createIndex(idx, 0, noParent);
|
|
|
|
dataChanged(tripIndex, tripIndex);
|
|
|
|
}
|
|
|
|
}
|
2018-10-29 19:17:53 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
bool DiveTripModelTree::lessThan(const QModelIndex &i1, const QModelIndex &i2) const
|
|
|
|
{
|
|
|
|
// In tree mode we don't support any sorting!
|
|
|
|
// Simply keep the original position.
|
|
|
|
return i1.row() < i2.row();
|
|
|
|
}
|
|
|
|
|
|
|
|
// 3) ListModel functions
|
|
|
|
|
|
|
|
DiveTripModelList::DiveTripModelList(QObject *parent) : DiveTripModelBase(parent)
|
|
|
|
{
|
|
|
|
// Stay informed of changes to the divelist
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesAdded, this, &DiveTripModelList::divesAdded);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesDeleted, this, &DiveTripModelList::divesDeleted);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &DiveTripModelList::divesChanged);
|
|
|
|
// Does nothing in list-view
|
|
|
|
//connect(&diveListNotifier, &DiveListNotifier::divesMovedBetweenTrips, this, &DiveTripModelList::divesMovedBetweenTrips);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesTimeChanged, this, &DiveTripModelList::divesTimeChanged);
|
|
|
|
connect(&diveListNotifier, &DiveListNotifier::divesSelected, this, &DiveTripModelList::divesSelected);
|
|
|
|
|
|
|
|
// Fill model
|
|
|
|
items.reserve(dive_table.nr);
|
|
|
|
for (int i = 0; i < dive_table.nr ; ++i)
|
|
|
|
items.push_back(get_dive(i));
|
|
|
|
}
|
|
|
|
|
|
|
|
int DiveTripModelList::rowCount(const QModelIndex &parent) const
|
|
|
|
{
|
|
|
|
// In list-mode there is only one level, i.e only top-level
|
|
|
|
// (=invalid parent) has items.
|
|
|
|
return parent.isValid() ? 0 : items.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
QModelIndex DiveTripModelList::index(int row, int column, const QModelIndex &parent) const
|
|
|
|
{
|
|
|
|
if (!hasIndex(row, column, parent))
|
|
|
|
return QModelIndex();
|
|
|
|
|
|
|
|
return createIndex(row, column);
|
|
|
|
}
|
|
|
|
|
|
|
|
QModelIndex DiveTripModelList::parent(const QModelIndex &index) const
|
|
|
|
{
|
|
|
|
// In list-mode there is only one level, i.e. no parent
|
|
|
|
return QModelIndex();
|
|
|
|
}
|
|
|
|
|
|
|
|
dive *DiveTripModelList::diveOrNull(const QModelIndex &index) const
|
|
|
|
{
|
|
|
|
int row = index.row();
|
|
|
|
if (row < 0 || row > (int)items.size())
|
|
|
|
return nullptr;
|
|
|
|
return items[row];
|
|
|
|
}
|
|
|
|
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
bool DiveTripModelList::setShown(const QModelIndex &idx, bool shown)
|
|
|
|
{
|
|
|
|
dive *d = diveOrNull(idx);
|
|
|
|
if (!d)
|
|
|
|
return false;
|
|
|
|
filter_dive(d, shown);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
QVariant DiveTripModelList::data(const QModelIndex &index, int role) const
|
|
|
|
{
|
|
|
|
// Set the font for all items alike
|
|
|
|
if (role == Qt::FontRole)
|
|
|
|
return defaultModelFont();
|
|
|
|
|
|
|
|
dive *d = diveOrNull(index);
|
Dive list: cache shown flag in model (quick-fix for undo-crash)
We have a very fundamental problem with data-duplication in
core and qt-models. In a particular case, this led to an easily
reproducible crash:
1) An undo command moved the last dive of a trip to another.
2) When an undo-command removed the last dive of
a trip to a different trip, the dive was removed from the
trip in the core. Then, the model was updated.
3) That lead at first to a rearrangement of the trips, because
the trip with the added dive is moved before the trip with
the removed dive.
4) In such a case, the filter-model checks the visibility of
the trip.
5) Since the trip with the removed dive has no dives in the core,
visibility was determined as false.
6) From this point on the mappings of the QSortFilterProxyModel
were messed up. Accesses led to crashes. It is unclear
whether this is a Qt bug or only a QOI issue.
As a quick-fix, cache the visibility flag of trips directly
in the Qt-models. Don't set the visibility directly in the
core, but go via the Qt-models. Thus, a more clear layering
is achieved.
In the long run, we can hopefully get rid of the data-duplication
in the models.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-22 18:48:59 +00:00
|
|
|
if (role == SHOWN_ROLE)
|
|
|
|
return d && !d->hidden_by_filter;
|
2018-12-27 09:06:11 +00:00
|
|
|
return d ? diveData(d, index.column(), role) : QVariant();
|
|
|
|
}
|
|
|
|
|
2019-06-23 07:22:26 +00:00
|
|
|
void DiveTripModelList::divesAdded(dive_trip *, bool, const QVector<dive *> &divesIn)
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
2019-06-23 07:22:26 +00:00
|
|
|
QVector<dive *> dives = divesIn;
|
|
|
|
std::sort(dives.begin(), dives.end(), dive_less_than);
|
2018-12-27 09:06:11 +00:00
|
|
|
addInBatches(items, dives,
|
|
|
|
&dive_less_than, // comp
|
|
|
|
[&](std::vector<dive *> &items, const QVector<dive *> &dives, int idx, int from, int to) { // inserter
|
|
|
|
beginInsertRows(QModelIndex(), idx, idx + to - from - 1);
|
|
|
|
items.insert(items.begin() + idx, dives.begin() + from, dives.begin() + to);
|
|
|
|
endInsertRows();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2019-06-23 07:22:26 +00:00
|
|
|
void DiveTripModelList::divesDeleted(dive_trip *, bool, const QVector<dive *> &divesIn)
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
2019-06-23 07:22:26 +00:00
|
|
|
QVector<dive *> dives = divesIn;
|
|
|
|
std::sort(dives.begin(), dives.end(), dive_less_than);
|
2018-12-27 09:06:11 +00:00
|
|
|
processRangesZip(items, dives,
|
|
|
|
[](const dive *d1, const dive *d2) { return d1 == d2; }, // Condition (std::equal_to only in C++14)
|
|
|
|
[&](std::vector<dive *> &items, const QVector<dive *> &, int from, int to, int) -> int { // Action
|
|
|
|
beginRemoveRows(QModelIndex(), from, to - 1);
|
|
|
|
items.erase(items.begin() + from, items.begin() + to);
|
|
|
|
endRemoveRows();
|
|
|
|
return from - to; // Delta: negate the number of items deleted
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2019-06-23 07:22:26 +00:00
|
|
|
void DiveTripModelList::divesChanged(const QVector<dive *> &divesIn)
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
2019-06-23 07:22:26 +00:00
|
|
|
QVector<dive *> dives = divesIn;
|
|
|
|
std::sort(dives.begin(), dives.end(), dive_less_than);
|
|
|
|
|
2019-03-22 19:55:05 +00:00
|
|
|
// Update filter flags. TODO: The filter should update the flag by itself when
|
|
|
|
// recieving the signals below.
|
|
|
|
for (dive *d: dives)
|
|
|
|
MultiFilterSortModel::instance()->updateDive(d);
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// Since we know that the dive list is sorted, we will only ever search for the first element
|
|
|
|
// in dives as this must be the first that we encounter. Once we find a range, increase the
|
|
|
|
// index accordingly.
|
|
|
|
processRangesZip(items, dives,
|
|
|
|
[](const dive *d1, const dive *d2) { return d1 == d2; }, // Condition (std::equal_to only in C++14)
|
|
|
|
[&](const std::vector<dive *> &, const QVector<dive *> &, int from, int to, int) -> int { // Action
|
|
|
|
// TODO: We might be smarter about which columns changed!
|
|
|
|
dataChanged(createIndex(from, 0, noParent), createIndex(to - 1, COLUMNS - 1, noParent));
|
|
|
|
return 0; // No items added or deleted
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2019-06-23 07:22:26 +00:00
|
|
|
void DiveTripModelList::divesTimeChanged(timestamp_t delta, const QVector<dive *> &divesIn)
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
2019-06-23 07:22:26 +00:00
|
|
|
QVector<dive *> dives = divesIn;
|
|
|
|
std::sort(dives.begin(), dives.end(), dive_less_than);
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// See comment for DiveTripModelTree::divesTimeChanged above.
|
|
|
|
QVector<dive *> selectedDives = filterSelectedDives(dives);
|
2019-06-23 07:22:26 +00:00
|
|
|
divesDeleted(nullptr, false, dives);
|
|
|
|
divesAdded(nullptr, false, dives);
|
2018-12-27 09:06:11 +00:00
|
|
|
}
|
|
|
|
|
2019-06-23 10:46:42 +00:00
|
|
|
void DiveTripModelList::divesSelected(const QVector<dive *> &dives, dive *current)
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
|
|
|
// We got a number of dives that have been selected. Turn this into QModelIndexes and
|
|
|
|
// emit a signal, so that views can change the selection.
|
|
|
|
QVector<QModelIndex> indexes;
|
|
|
|
indexes.reserve(dives.count());
|
|
|
|
|
|
|
|
// Since both lists are sorted, we can do this linearly. Perhaps a binary search
|
|
|
|
// would be better?
|
|
|
|
int j = 0; // Index in items array
|
|
|
|
for (int i = 0; i < dives.size(); ++i) {
|
|
|
|
while (j < (int)items.size() && items[j] != dives[i])
|
|
|
|
++j;
|
|
|
|
if (j >= (int)items.size())
|
|
|
|
break;
|
|
|
|
indexes.append(createIndex(j, 0, noParent));
|
|
|
|
}
|
|
|
|
|
2019-06-23 09:13:41 +00:00
|
|
|
emit selectionChanged(indexes);
|
2018-12-27 09:06:11 +00:00
|
|
|
|
2019-06-23 10:46:42 +00:00
|
|
|
// Transform the current dive into an index and pass it on to the view.
|
|
|
|
if (!current) {
|
2018-12-27 09:06:11 +00:00
|
|
|
emit newCurrentDive(QModelIndex()); // No current dive -> tell view to clear current index with an invalid index
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-06-23 10:46:42 +00:00
|
|
|
auto it = std::find(items.begin(), items.end(), current);
|
2018-12-27 09:06:11 +00:00
|
|
|
if (it == items.end()) {
|
|
|
|
// We don't know this dive. Something is wrong. Warn and bail.
|
2019-06-23 10:46:42 +00:00
|
|
|
qWarning() << "DiveTripModelList::divesSelected(): unknown dive";
|
2018-12-27 09:06:11 +00:00
|
|
|
emit newCurrentDive(QModelIndex());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
emit newCurrentDive(createIndex(it - items.begin(), 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
void DiveTripModelList::filterFinished()
|
|
|
|
{
|
|
|
|
// In list mode, we don't have to change anything after filter finished.
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-10-29 19:17:53 +00:00
|
|
|
// Simple sorting helper for sorting against a criterium and if
|
|
|
|
// that is undefined against a different criterium.
|
|
|
|
// Return true if diff1 < 0, false if diff1 > 0.
|
|
|
|
// If diff1 == 0 return true if diff2 < 0;
|
|
|
|
static bool lessThanHelper(int diff1, int diff2)
|
|
|
|
{
|
|
|
|
return diff1 < 0 || (diff1 == 0 && diff2 < 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int strCmp(const char *s1, const char *s2)
|
|
|
|
{
|
|
|
|
if (!s1)
|
|
|
|
return !s2 ? 0 : -1;
|
|
|
|
if (!s2)
|
|
|
|
return 1;
|
|
|
|
return QString::localeAwareCompare(QString(s1), QString(s2)); // TODO: avoid copy
|
|
|
|
}
|
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
bool DiveTripModelList::lessThan(const QModelIndex &i1, const QModelIndex &i2) const
|
2018-10-29 19:17:53 +00:00
|
|
|
{
|
|
|
|
// We assume that i1.column() == i2.column().
|
|
|
|
int row1 = i1.row();
|
|
|
|
int row2 = i2.row();
|
|
|
|
if (row1 < 0 || row1 >= (int)items.size() || row2 < 0 || row2 >= (int)items.size())
|
|
|
|
return false;
|
2018-12-27 09:06:11 +00:00
|
|
|
const dive *d1 = items[row1];
|
|
|
|
const dive *d2 = items[row2];
|
2018-11-06 20:48:18 +00:00
|
|
|
// This is used as a second sort criterion: For equal values, sorting is chronologically *descending*.
|
|
|
|
int row_diff = row2 - row1;
|
2018-10-29 19:17:53 +00:00
|
|
|
switch (i1.column()) {
|
|
|
|
case NR:
|
|
|
|
case DATE:
|
|
|
|
default:
|
2018-11-06 20:48:18 +00:00
|
|
|
return row1 < row2;
|
2018-10-29 19:17:53 +00:00
|
|
|
case RATING:
|
|
|
|
return lessThanHelper(d1->rating - d2->rating, row_diff);
|
|
|
|
case DEPTH:
|
|
|
|
return lessThanHelper(d1->maxdepth.mm - d2->maxdepth.mm, row_diff);
|
|
|
|
case DURATION:
|
|
|
|
return lessThanHelper(d1->duration.seconds - d2->duration.seconds, row_diff);
|
|
|
|
case TEMPERATURE:
|
|
|
|
return lessThanHelper(d1->watertemp.mkelvin - d2->watertemp.mkelvin, row_diff);
|
|
|
|
case TOTALWEIGHT:
|
|
|
|
return lessThanHelper(total_weight(d1) - total_weight(d2), row_diff);
|
|
|
|
case SUIT:
|
|
|
|
return lessThanHelper(strCmp(d1->suit, d2->suit), row_diff);
|
|
|
|
case CYLINDER:
|
|
|
|
return lessThanHelper(strCmp(d1->cylinder[0].type.description, d2->cylinder[0].type.description), row_diff);
|
|
|
|
case GAS:
|
|
|
|
return lessThanHelper(nitrox_sort_value(d1) - nitrox_sort_value(d2), row_diff);
|
|
|
|
case SAC:
|
|
|
|
return lessThanHelper(d1->sac - d2->sac, row_diff);
|
|
|
|
case OTU:
|
|
|
|
return lessThanHelper(d1->otu - d2->otu, row_diff);
|
|
|
|
case MAXCNS:
|
|
|
|
return lessThanHelper(d1->maxcns - d2->maxcns, row_diff);
|
|
|
|
case TAGS: {
|
|
|
|
char *s1 = taglist_get_tagstring(d1->tag_list);
|
|
|
|
char *s2 = taglist_get_tagstring(d2->tag_list);
|
|
|
|
int diff = strCmp(s1, s2);
|
|
|
|
free(s1);
|
|
|
|
free(s2);
|
|
|
|
return lessThanHelper(diff, row_diff);
|
|
|
|
}
|
|
|
|
case PHOTOS:
|
|
|
|
return lessThanHelper(countPhotos(d1) - countPhotos(d2), row_diff);
|
|
|
|
case COUNTRY:
|
|
|
|
return lessThanHelper(strCmp(get_dive_country(d1), get_dive_country(d2)), row_diff);
|
|
|
|
case BUDDIES:
|
|
|
|
return lessThanHelper(strCmp(d1->buddy, d2->buddy), row_diff);
|
|
|
|
case LOCATION:
|
|
|
|
return lessThanHelper(strCmp(get_dive_location(d1), get_dive_location(d2)), row_diff);
|
|
|
|
}
|
|
|
|
}
|