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

Printing: use regexp in preprocessTemplate()

Browse source 
preprocessTemplate() replaces variables of the kind "dive.weight0"
by "dive.weights.0". Replace the old code by regexps. This not
only makes the code significantly shorter, it also makes it independent
from the name of the dive variable (i.e. "dive").

Moreover, it removes a dependency on MAX_WEIGHTSYSTEMS and MAX_CYLINDERS,
which might help in removing these restrictions.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-06-06 07:41:29 +02:00 • committed by Lubomir I. Ivanov
parent 17b059fcd6
commit efb98cfd69
1 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
desktop-widgets/templatelayout.cpp
View file

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <QFileDevice> #include <QFileDevice>
#include <QRegularExpression>
#include <list> #include <list>
#include "templatelayout.h" #include "templatelayout.h"
@ -99,34 +100,26 @@ 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 DiveObjectHelper Q_PROPERTIES:
*/ * dive.weights -> dive.weightList
* dive.weight# -> dive.weights.#
* dive.cylinders -> dive.cylinderList
* dive.cylinder# -> dive.cylinders.#
* The Grantlee parser works with a single or no space next to the variable
* markers - e.g. '{{ var }}'. We're graceful and support an arbitrary number of
* whitespace. */
static QRegularExpression weightsRegExp(R"({{\*?([A-Za-z]+[A-Za-z0-9]*).weights\s*}})");
static QRegularExpression weightRegExp(R"({{\*?([A-Za-z]+[A-Za-z0-9]*).weight(\d+)\s*}})");
static QRegularExpression cylindersRegExp(R"({{\*?([A-Za-z]+[A-Za-z0-9]*).cylinders\s*}})");
static QRegularExpression cylinderRegExp(R"({{\s*([A-Za-z]+[A-Za-z0-9]*).cylinder(\d+)\s*}})");
static QString preprocessTemplate(const QString &in) static QString preprocessTemplate(const QString &in)
{ {
int i;
QString out = in; QString out = in;
QString iStr;
QList<QPair<QString, QString> > list;
/* populate known variables in a QPair list */ out.replace(weightsRegExp, QStringLiteral(R"({{\1.weightList}})"));
list << qMakePair(QString("dive.weights"), QString("dive.weightList")); out.replace(weightRegExp, QStringLiteral(R"({{\1.weights.\2}})"));
for (i = 0; i < MAX_WEIGHTSYSTEMS; i++) out.replace(cylindersRegExp, QStringLiteral(R"({{\1.cylinderList}})"));
list << qMakePair(QString("dive.weight%1").arg(i), QString("dive.weights.%1").arg(i)); out.replace(cylindersRegExp, QStringLiteral(R"({{\1.cylinders.\2}})"));
list << qMakePair(QString("dive.cylinders"), QString("dive.cylinderList"));
for (i = 0; i < MAX_CYLINDERS; i++)
list << qMakePair(QString("dive.cylinder%1").arg(i), QString("dive.cylinders.%1").arg(i));
/* lazy method of variable replacement without regex. the Grantlee parser
* works with a single or no space next to the variable markers -
* e.g. '{{ var }}' */
for (i = 0; i < list.length(); i++) {
QPair<QString, QString> p = list.at(i);
out.replace("{{ " + p.first + " }}", "{{ " + p.second + " }}");
out.replace("{{" + p.first + "}}", "{{" + p.second + "}}");
out.replace("{{ " + p.first + "}}", "{{ " + p.second + "}}");
out.replace("{{" + p.first + " }}", "{{" + p.second + " }}");
}
return out; return out;
} }