GI improvements

* add tag information to GI configuration
* change tag identification to avoid keys reorderding
This commit is contained in:
2016-04-14 16:14:26 +03:00
parent a3e7a84b92
commit f7a6b86cae
3 changed files with 41 additions and 14 deletions

View File

@ -312,14 +312,12 @@ QString AWKeys::parsePattern(QString pattern) const
// bars
for (auto bar : m_foundBars) {
GraphicalItem *item = keyOperator->giByKey(bar);
if (item->isCustom())
pattern.replace(
QString("$%1").arg(bar),
item->image(AWPatternFunctions::expandLambdas(
item->bar(), aggregator, values, item->usedKeys())));
else
pattern.replace(QString("$%1").arg(bar),
item->image(values[item->bar()]));
QString image
= item->isCustom()
? item->image(AWPatternFunctions::expandLambdas(
item->bar(), aggregator, values, item->usedKeys()))
: item->image(values[item->bar()]);
pattern.replace(QString("$%1").arg(bar), image);
}
// prepare strings