mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Grantlee: split out grantlee-only property from DiveObjectHelper

Browse source 
The cylindersObject list was only used by grantlee but not by
the mobile code. Since it is quite heavy, split it out and thus
don't generate it for every dive on mobile.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-08-22 19:40:42 +02:00 • committed by bstoeger
parent 6a9df3bba3
commit 718c07c1a8
4 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -238,7 +238,6 @@ DiveObjectHelper::DiveObjectHelper(const struct dive *d) :
singleWeight(d->weightsystems.nr <= 1), singleWeight(d->weightsystems.nr <= 1),
suit(d->suit ? d->suit : QString()), suit(d->suit ? d->suit : QString()),
cylinders(formatCylinders(d)), cylinders(formatCylinders(d)),
cylinderObjects(makeCylinderObjects(d)),
maxcns(d->maxcns), maxcns(d->maxcns),
otu(d->otu), otu(d->otu),
sumWeight(get_weight_string(weight_t { total_weight(d) }, true)), sumWeight(get_weight_string(weight_t { total_weight(d) }, true)),
@ -249,6 +248,16 @@ DiveObjectHelper::DiveObjectHelper(const struct dive *d) :
{ {
} }
DiveObjectHelperGrantlee::DiveObjectHelperGrantlee()
{
}
DiveObjectHelperGrantlee::DiveObjectHelperGrantlee(const struct dive *d) :
DiveObjectHelper(d),
cylinderObjects(makeCylinderObjects(d))
{
}
QString DiveObjectHelper::date() const QString DiveObjectHelper::date() const
{ {
QDateTime localTime = QDateTime::fromMSecsSinceEpoch(1000 * timestamp, Qt::UTC); QDateTime localTime = QDateTime::fromMSecsSinceEpoch(1000 * timestamp, Qt::UTC);

19
core/subsurface-qt/DiveObjectHelper.h
View file

@ -39,7 +39,6 @@ class DiveObjectHelper {
Q_PROPERTY(QString suit MEMBER suit CONSTANT) Q_PROPERTY(QString suit MEMBER suit CONSTANT)
Q_PROPERTY(QStringList cylinderList READ cylinderList CONSTANT) Q_PROPERTY(QStringList cylinderList READ cylinderList CONSTANT)
Q_PROPERTY(QStringList cylinders MEMBER cylinders CONSTANT) Q_PROPERTY(QStringList cylinders MEMBER cylinders CONSTANT)
Q_PROPERTY(QVector<CylinderObjectHelper> cylinderObjects MEMBER cylinderObjects CONSTANT)
Q_PROPERTY(int maxcns MEMBER maxcns CONSTANT) Q_PROPERTY(int maxcns MEMBER maxcns CONSTANT)
Q_PROPERTY(int otu MEMBER otu CONSTANT) Q_PROPERTY(int otu MEMBER otu CONSTANT)
Q_PROPERTY(QString sumWeight MEMBER sumWeight CONSTANT) Q_PROPERTY(QString sumWeight MEMBER sumWeight CONSTANT)
@ -78,7 +77,6 @@ public:
QString suit; QString suit;
QStringList cylinderList() const; QStringList cylinderList() const;
QStringList cylinders; QStringList cylinders;
QVector<CylinderObjectHelper> cylinderObjects;
int maxcns; int maxcns;
int otu; int otu;
QString sumWeight; QString sumWeight;
@ -87,6 +85,21 @@ public:
QStringList endPressure; QStringList endPressure;
QStringList firstGas; QStringList firstGas;
}; };
Q_DECLARE_METATYPE(DiveObjectHelper)
// This is an extended version of DiveObjectHelper that also keeps track of cylinder data.
// It is used by grantlee to display structured cylinder data.
// Note: this grantlee feature is undocumented. If there turns out to be no users, we might
// want to remove this class.
class DiveObjectHelperGrantlee : public DiveObjectHelper {
Q_GADGET
Q_PROPERTY(QVector<CylinderObjectHelper> cylinderObjects MEMBER cylinderObjects CONSTANT)
public:
DiveObjectHelperGrantlee();
DiveObjectHelperGrantlee(const struct dive *dive);
QVector<CylinderObjectHelper> cylinderObjects;
};
Q_DECLARE_METATYPE(DiveObjectHelper)
Q_DECLARE_METATYPE(DiveObjectHelperGrantlee)
#endif #endif

10
desktop-widgets/templatelayout.cpp
View file

@ -100,7 +100,7 @@ TemplateLayout::TemplateLayout(print_options *printOptions, template_options *te
} }
/* a HTML pre-processor stage. acts like a compatibility layer /* a HTML pre-processor stage. acts like a compatibility layer
* between some Grantlee variables and DiveObjectHelper Q_PROPERTIES: * between some Grantlee variables and DiveObjectHelperGrantlee Q_PROPERTIES:
* dive.weights -> dive.weightList * dive.weights -> dive.weightList
* dive.weight# -> dive.weights.# * dive.weight# -> dive.weights.#
* dive.cylinders -> dive.cylinderList * dive.cylinders -> dive.cylinderList
@ -134,13 +134,13 @@ QString TemplateLayout::generate()
Grantlee::registerMetaType<template_options>(); Grantlee::registerMetaType<template_options>();
Grantlee::registerMetaType<print_options>(); Grantlee::registerMetaType<print_options>();
Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET
Grantlee::registerMetaType<DiveObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET Grantlee::registerMetaType<DiveObjectHelperGrantlee>(); // TODO: Remove when grantlee supports Q_GADGET
QVariantList diveList; QVariantList diveList;
struct dive *dive; struct dive *dive;
if (in_planner()) { if (in_planner()) {
diveList.append(QVariant::fromValue(DiveObjectHelper(&displayed_dive))); diveList.append(QVariant::fromValue(DiveObjectHelperGrantlee(&displayed_dive)));
emit progressUpdated(100.0); emit progressUpdated(100.0);
} else { } else {
int i; int i;
@ -148,7 +148,7 @@ QString TemplateLayout::generate()
//TODO check for exporting selected dives only //TODO check for exporting selected dives only
if (!dive->selected && printOptions->print_selected) if (!dive->selected && printOptions->print_selected)
continue; continue;
diveList.append(QVariant::fromValue(DiveObjectHelper(dive))); diveList.append(QVariant::fromValue(DiveObjectHelperGrantlee(dive)));
progress++; progress++;
emit progressUpdated(lrint(progress * 100.0 / totalWork)); emit progressUpdated(lrint(progress * 100.0 / totalWork));
} }
@ -191,7 +191,7 @@ QString TemplateLayout::generateStatistics()
Grantlee::registerMetaType<template_options>(); Grantlee::registerMetaType<template_options>();
Grantlee::registerMetaType<print_options>(); Grantlee::registerMetaType<print_options>();
Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET
Grantlee::registerMetaType<DiveObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET Grantlee::registerMetaType<DiveObjectHelperGrantlee>(); // TODO: Remove when grantlee supports Q_GADGET
QVariantList years; QVariantList years;

2
desktop-widgets/templatelayout.h
View file

@ -143,7 +143,7 @@ GRANTLEE_END_LOOKUP
// TODO: This is currently needed because our grantlee version // TODO: This is currently needed because our grantlee version
// doesn't support Q_GADGET based classes. A patch to fix this // doesn't support Q_GADGET based classes. A patch to fix this
// exists. Remove in due course. // exists. Remove in due course.
GRANTLEE_BEGIN_LOOKUP(DiveObjectHelper) GRANTLEE_BEGIN_LOOKUP(DiveObjectHelperGrantlee)
if (property == "number") { if (property == "number") {
return object.number; return object.number;
} else if (property == "id") { } else if (property == "id") {