Commit 5f5471b3 authored by yannick legoc's avatar yannick legoc

Corrected MathExpressionRenamer that was not removing the whitespaces in the alias property names

parent 6f0717ef
......@@ -88,7 +88,7 @@ std::string MathExpressionRenamer::getNewVariableName(const std::string& variabl
for (auto i : items) {
// The variable name is already the alias.
if (i.aliasPropertyName == variableInfos.name) {
if (aliasInExpression(i) == variableInfos.name) {
return variableName;
}
}
......@@ -100,7 +100,7 @@ std::string MathExpressionRenamer::getNewVariableName(const std::string& variabl
if (i.aliasPropertyName != "") {
if (i.actualPropertyName == variableInfos.name) {
return variableInfos.servant + "." + i.aliasPropertyName + "." + to_string(variableInfos.index);
return variableInfos.servant + "." + aliasInExpression(i) + "." + to_string(variableInfos.index);
}
}
}
......@@ -116,7 +116,7 @@ std::string MathExpressionRenamer::getNewVariableName(const std::string& variabl
for (auto i : items) {
// The variable name is already the alias.
if (i.aliasPropertyName == variableInfos.name) {
if (aliasInExpression(i) == variableInfos.name) {
return variableName;
}
}
......@@ -128,13 +128,13 @@ std::string MathExpressionRenamer::getNewVariableName(const std::string& variabl
if (i.aliasPropertyName != "") {
if (i.actualPropertyName == variableInfos.name) {
return variableInfos.servant + "." + i.aliasPropertyName;
return variableInfos.servant + "." + aliasInExpression(i);
}
else if (i.setpointPropertyName == variableInfos.name) {
return variableInfos.servant + "." + i.aliasPropertyName + ".sp";
return variableInfos.servant + "." + aliasInExpression(i) + ".sp";
}
else if (i.offsetPropertyName == variableInfos.name) {
return variableInfos.servant + "." + i.aliasPropertyName + ".os";
return variableInfos.servant + "." + aliasInExpression(i) + ".os";
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment