aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support local separator for numbers in formulas. Fix bug in translation formula.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-05-27 17:58:25 +03:00
parent 1501eb77eb
commit 6b4067ee1b
3 changed files with 177 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/container/calculator.cpp
View File

@ -49,6 +49,9 @@ Calculator::Calculator(const VContainer *data)
DefinePostfixOprt(cm_Oprt, CmUnit); DefinePostfixOprt(cm_Oprt, CmUnit);
DefinePostfixOprt(mm_Oprt, MmUnit); DefinePostfixOprt(mm_Oprt, MmUnit);
DefinePostfixOprt(in_Oprt, InchUnit); DefinePostfixOprt(in_Oprt, InchUnit);
SetArgSep(',');
SetDecSep('.');
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -65,7 +68,7 @@ Calculator::Calculator(const QString &formula, bool fromUser)
DefinePostfixOprt(qApp->PostfixOperator(mm_Oprt), MmUnit); DefinePostfixOprt(qApp->PostfixOperator(mm_Oprt), MmUnit);
DefinePostfixOprt(qApp->PostfixOperator(in_Oprt), InchUnit); DefinePostfixOprt(qApp->PostfixOperator(in_Oprt), InchUnit);
QLocale loc = QLocale(); QLocale loc = QLocale::system();
SetDecSep(loc.decimalPoint().toLatin1()); SetDecSep(loc.decimalPoint().toLatin1());
SetThousandsSep(loc.groupSeparator().toLatin1()); SetThousandsSep(loc.groupSeparator().toLatin1());
SetArgSep(';'); SetArgSep(';');
@ -75,6 +78,9 @@ Calculator::Calculator(const QString &formula, bool fromUser)
DefinePostfixOprt(cm_Oprt, CmUnit); DefinePostfixOprt(cm_Oprt, CmUnit);
DefinePostfixOprt(mm_Oprt, MmUnit); DefinePostfixOprt(mm_Oprt, MmUnit);
DefinePostfixOprt(in_Oprt, InchUnit); DefinePostfixOprt(in_Oprt, InchUnit);
SetArgSep(',');
SetDecSep('.');
} }
SetExpr(formula); SetExpr(formula);

219
src/app/widgets/vapplication.cpp
View File

@ -1505,7 +1505,7 @@ void VApplication::InitPostfixOperators()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VApplication::MeasurementsFromUser(QString &newFormula, int position, const QString &token) const bool VApplication::MeasurementsFromUser(QString &newFormula, int position, const QString &token, int &bias) const
{ {
QMap<QString, VTranslation>::const_iterator i = measurements.constBegin(); QMap<QString, VTranslation>::const_iterator i = measurements.constBegin();
while (i != measurements.constEnd()) while (i != measurements.constEnd())
@ -1513,6 +1513,7 @@ bool VApplication::MeasurementsFromUser(QString &newFormula, int position, const
if(token == i.value().translate()) if(token == i.value().translate())
{ {
newFormula.replace(position, token.length(), i.key()); newFormula.replace(position, token.length(), i.key());
bias = token.length() - i.key().length();
return true; return true;
} }
++i; ++i;
@ -1521,7 +1522,7 @@ bool VApplication::MeasurementsFromUser(QString &newFormula, int position, const
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VApplication::VariablesFromUser(QString &newFormula, int position, const QString &token) const bool VApplication::VariablesFromUser(QString &newFormula, int position, const QString &token, int &bias) const
{ {
QMap<QString, VTranslation>::const_iterator i = variables.constBegin(); QMap<QString, VTranslation>::const_iterator i = variables.constBegin();
while (i != variables.constEnd()) while (i != variables.constEnd())
@ -1529,6 +1530,9 @@ bool VApplication::VariablesFromUser(QString &newFormula, int position, const QS
if(token.indexOf( i.value().translate() ) == 0) if(token.indexOf( i.value().translate() ) == 0)
{ {
newFormula.replace(position, i.value().translate().length(), i.key()); newFormula.replace(position, i.value().translate().length(), i.key());
QString newToken = token;
newToken.replace(0, i.value().translate().length(), i.key());
bias = token.length() - newToken.length();
return true; return true;
} }
++i; ++i;
@ -1537,7 +1541,7 @@ bool VApplication::VariablesFromUser(QString &newFormula, int position, const QS
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VApplication::PostfixOperatorsFromUser(QString &newFormula, int position, const QString &token) const bool VApplication::PostfixOperatorsFromUser(QString &newFormula, int position, const QString &token, int &bias) const
{ {
QMap<QString, VTranslation>::const_iterator i = postfixOperators.constBegin(); QMap<QString, VTranslation>::const_iterator i = postfixOperators.constBegin();
while (i != postfixOperators.constEnd()) while (i != postfixOperators.constEnd())
@ -1545,6 +1549,7 @@ bool VApplication::PostfixOperatorsFromUser(QString &newFormula, int position, c
if(token == i.value().translate()) if(token == i.value().translate())
{ {
newFormula.replace(position, token.length(), i.key()); newFormula.replace(position, token.length(), i.key());
bias = token.length() - i.key().length();
return true; return true;
} }
++i; ++i;
@ -1553,7 +1558,7 @@ bool VApplication::PostfixOperatorsFromUser(QString &newFormula, int position, c
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VApplication::FunctionsFromUser(QString &newFormula, int position, const QString &token) const bool VApplication::FunctionsFromUser(QString &newFormula, int position, const QString &token, int &bias) const
{ {
QMap<QString, VTranslation>::const_iterator i = functions.constBegin(); QMap<QString, VTranslation>::const_iterator i = functions.constBegin();
while (i != functions.constEnd()) while (i != functions.constEnd())
@ -1561,6 +1566,7 @@ bool VApplication::FunctionsFromUser(QString &newFormula, int position, const QS
if(token == i.value().translate()) if(token == i.value().translate())
{ {
newFormula.replace(position, token.length(), i.key()); newFormula.replace(position, token.length(), i.key());
bias = token.length() - i.key().length();
return true; return true;
} }
++i; ++i;
@ -1569,7 +1575,7 @@ bool VApplication::FunctionsFromUser(QString &newFormula, int position, const QS
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VApplication::VariablesToUser(QString &newFormula, int position, const QString &token) const bool VApplication::VariablesToUser(QString &newFormula, int position, const QString &token, int &bias) const
{ {
QMap<QString, VTranslation>::const_iterator i = variables.constBegin(); QMap<QString, VTranslation>::const_iterator i = variables.constBegin();
while (i != variables.constEnd()) while (i != variables.constEnd())
@ -1577,6 +1583,10 @@ bool VApplication::VariablesToUser(QString &newFormula, int position, const QStr
if(token.indexOf( i.key() ) == 0) if(token.indexOf( i.key() ) == 0)
{ {
newFormula.replace(position, i.key().length(), i.value().translate()); newFormula.replace(position, i.key().length(), i.value().translate());
QString newToken = token;
newToken.replace(0, i.key().length(), i.value().translate());
bias = token.length() - newToken.length();
return true; return true;
} }
++i; ++i;
@ -1584,6 +1594,37 @@ bool VApplication::VariablesToUser(QString &newFormula, int position, const QStr
return false; return false;
} }
void VApplication::CorrectionsPositions(int position, int bias, QMap<int, QString> &tokens,
QMap<int, QString> &numbers)
{
if(bias == 0)
{
return;
}
BiasTokens(position, bias, tokens);
BiasTokens(position, bias, numbers);
}
void VApplication::BiasTokens(int position, int bias, QMap<int, QString> &tokens) const
{
QMap<int, QString> newTokens;
QMap<int, QString>::const_iterator i = tokens.constBegin();
while (i != tokens.constEnd())
{
if(i.key()<= position)
{
newTokens.insert(i.key(), i.value());
}
else
{
newTokens.insert(i.key()-bias, i.value());
}
++i;
}
tokens = newTokens;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VApplication::setPatternUnit(const Valentina::Units &patternUnit) void VApplication::setPatternUnit(const Valentina::Units &patternUnit)
{ {
@ -1610,7 +1651,8 @@ QString VApplication::VarToUser(const QString &var) const
} }
QString newVar = var; QString newVar = var;
if(VariablesToUser(newVar, 0, var)) int bias = 0;
if(VariablesToUser(newVar, 0, var, bias))
{ {
return newVar; return newVar;
} }
@ -1621,22 +1663,23 @@ QString VApplication::VarToUser(const QString &var) const
QString VApplication::VarFromUser(const QString &var) const QString VApplication::VarFromUser(const QString &var) const
{ {
QString newVar = var; QString newVar = var;
if(MeasurementsFromUser(newVar, 0, var)) int bias = 0;
if(MeasurementsFromUser(newVar, 0, var, bias))
{ {
return newVar; return newVar;
} }
if(VariablesFromUser(newVar, 0, var)) if(VariablesFromUser(newVar, 0, var, bias))
{ {
return newVar; return newVar;
} }
if(PostfixOperatorsFromUser(newVar, 0, var)) if(PostfixOperatorsFromUser(newVar, 0, var, bias))
{ {
return newVar; return newVar;
} }
if(FunctionsFromUser(newVar, 0, var)) if(FunctionsFromUser(newVar, 0, var, bias))
{ {
return newVar; return newVar;
} }
@ -1696,58 +1739,84 @@ QString VApplication::FormulaFromUser(const QString &formula)
return newFormula; return newFormula;
} }
QMap<int, QString>::const_iterator i = tokens.constBegin(); QList<int> tKeys = tokens.keys();
while (i != tokens.constEnd()) QList<QString> tValues = tokens.values();
for (int i = 0; i < tKeys.size(); ++i)
{ {
if(MeasurementsFromUser(newFormula, i.key(), i.value())) int bias = 0;
if(MeasurementsFromUser(newFormula, tKeys.at(i), tValues.at(i), bias))
{ {
++i; if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
if(VariablesFromUser(newFormula, i.key(), i.value())) if(VariablesFromUser(newFormula, tKeys.at(i), tValues.at(i), bias))
{ {
++i; if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
if(PostfixOperatorsFromUser(newFormula, i.key(), i.value())) if(PostfixOperatorsFromUser(newFormula, tKeys.at(i), tValues.at(i), bias))
{ {
++i; if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
if(FunctionsFromUser(newFormula, i.key(), i.value())) if(FunctionsFromUser(newFormula, tKeys.at(i), tValues.at(i), bias))
{ {
++i; if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
++i;
} }
QLocale loc = QLocale(); QLocale loc = QLocale::system();
if(loc != QLocale(QLocale::C)) if(loc != QLocale(QLocale::C))
{ {
QMap<int, QString>::const_iterator i = numbers.constBegin(); QList<int> nKeys = numbers.keys();
while (i != numbers.constEnd()) QList<QString> nValues = numbers.values();
for (int i = 0; i < tKeys.size(); ++i)
{ {
QLocale::setDefault(QLocale::C);
bool ok = false; bool ok = false;
qreal d = QString(i.value()).toDouble(&ok); qreal d = loc.toDouble(nValues.at(i), &ok);
if(ok == false) if (ok == false)
{ {
qDebug()<<"Can't convert to double token"<<i.value(); qDebug()<<"Can't convert to double token"<<nValues.at(i);
++i;
continue; continue;
} }
if(qFloor (d) < d) if (qFloor (d) < d)
{ {
QLocale::setDefault(QLocale::system()); QLocale loc = QLocale(QLocale::C);
QLocale loc = QLocale();
QString dStr = loc.toString(d); QString dStr = loc.toString(d);
newFormula.replace(i.key(), i.value().length(), dStr); newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr);
int bias = nValues.at(i).length() - dStr.length();
if (bias != 0)
{
CorrectionsPositions(nKeys.at(i), bias, tokens, numbers);
nKeys = numbers.keys();
nValues = numbers.values();
}
} }
++i;
} }
} }
@ -1764,7 +1833,7 @@ QString VApplication::FormulaToUser(const QString &formula)
QMap<int, QString> numbers; QMap<int, QString> numbers;
try try
{ {
Calculator cal(formula); Calculator cal(formula, false);
tokens = cal.GetTokens(); tokens = cal.GetTokens();
numbers = cal.GetNumbers(); numbers = cal.GetNumbers();
} }
@ -1778,61 +1847,91 @@ QString VApplication::FormulaToUser(const QString &formula)
return newFormula; return newFormula;
} }
QMap<int, QString>::const_iterator i = tokens.constBegin(); QList<int> tKeys = tokens.keys();
while (i != tokens.constEnd()) QList<QString> tValues = tokens.values();
for (int i = 0; i < tKeys.size(); ++i)
{ {
if (measurements.contains(i.value())) if (measurements.contains(tValues.at(i)))
{ {
newFormula.replace(i.key(), i.value().length(), measurements.value(i.value()).translate()); newFormula.replace(tKeys.at(i), tValues.at(i).length(), measurements.value(tValues.at(i)).translate());
++i; int bias = tValues.at(i).length() - measurements.value(tValues.at(i)).translate().length();
if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
if (functions.contains(i.value())) if (functions.contains(tValues.at(i)))
{ {
newFormula.replace(i.key(), i.value().length(), functions.value(i.value()).translate()); newFormula.replace(tKeys.at(i), tValues.at(i).length(), functions.value(tValues.at(i)).translate());
++i; int bias = tValues.at(i).length() - functions.value(tValues.at(i)).translate().length();
if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
if (postfixOperators.contains(i.value())) if (postfixOperators.contains(tValues.at(i)))
{ {
newFormula.replace(i.key(), i.value().length(), postfixOperators.value(i.value()).translate()); newFormula.replace(tKeys.at(i), tValues.at(i).length(), postfixOperators.value(tValues.at(i)).translate());
++i; int bias = tValues.at(i).length() - postfixOperators.value(tValues.at(i)).translate().length();
if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
if(VariablesToUser(newFormula, i.key(), i.value())) int bias = 0;
if(VariablesToUser(newFormula, tKeys.at(i), tValues.at(i), bias))
{ {
++i; if (bias != 0)
{
CorrectionsPositions(tKeys.at(i), bias, tokens, numbers);
tKeys = tokens.keys();
tValues = tokens.values();
}
continue; continue;
} }
} }
QLocale loc = QLocale(); QLocale loc = QLocale::system();
if(loc != QLocale::C) if(loc != QLocale::C)
{ {
QMap<int, QString>::const_iterator i = numbers.constBegin(); QList<int> nKeys = numbers.keys();
while (i != numbers.constEnd()) QList<QString> nValues = numbers.values();
for (int i = 0; i < tKeys.size(); ++i)
{ {
QLocale loc = QLocale(QLocale::C);
bool ok = false; bool ok = false;
qreal d = QString(i.value()).toDouble(&ok); qreal d = loc.toDouble(nValues.at(i), &ok);
if(ok == false) if(ok == false)
{ {
qDebug()<<"Can't convert to double token"<<i.value(); qDebug()<<"Can't convert to double token"<<nValues.at(i);
++i;
continue; continue;
} }
if(qFloor (d) < d) if(qFloor (d) < d)
{ {
QLocale::setDefault(QLocale::C); QLocale loc = QLocale::system();
QLocale loc = QLocale();
QString dStr = loc.toString(d); QString dStr = loc.toString(d);
newFormula.replace(i.key(), i.value().length(), dStr); newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr);
QLocale::setDefault(QLocale::system()); int bias = nValues.at(i).length() - dStr.length();
if (bias != 0)
{
CorrectionsPositions(nKeys.at(i), bias, tokens, numbers);
nKeys = numbers.keys();
nValues = numbers.values();
}
} }
++i;
} }
} }

16
src/app/widgets/vapplication.h
View File

@ -97,11 +97,17 @@ private:
void InitVariables(); void InitVariables();
void InitFunctions(); void InitFunctions();
void InitPostfixOperators(); void InitPostfixOperators();
bool MeasurementsFromUser(QString &newFormula, int position, const QString &token) const; bool MeasurementsFromUser(QString &newFormula, int position, const QString &token,
bool VariablesFromUser(QString &newFormula, int position, const QString &token) const; int &bias) const;
bool PostfixOperatorsFromUser(QString &newFormula, int position, const QString &token) const; bool VariablesFromUser(QString &newFormula, int position, const QString &token, int &bias) const;
bool FunctionsFromUser(QString &newFormula, int position, const QString &token) const; bool PostfixOperatorsFromUser(QString &newFormula, int position, const QString &token,
bool VariablesToUser(QString &newFormula, int position, const QString &token) const; int &bias) const;
bool FunctionsFromUser(QString &newFormula, int position, const QString &token, int &bias) const;
bool VariablesToUser(QString &newFormula, int position, const QString &token, int &bias) const;
void CorrectionsPositions(int position, int bias, QMap<int, QString> &tokens,
QMap<int, QString> &numbers);
void BiasTokens(int position, int bias, QMap<int, QString> &tokens) const;
}; };
inline Valentina::Units VApplication::patternUnit() const inline Valentina::Units VApplication::patternUnit() const