Fixed issue #491. Valentina doesn't update fractional separator.
--HG-- branch : release
This commit is contained in:
parent
6489c34b23
commit
643c60cc70
|
@ -2,6 +2,7 @@
|
||||||
- [#435] Valentina doesn't change the cursor.
|
- [#435] Valentina doesn't change the cursor.
|
||||||
- [#473] Tape 'Preferences' cause loss of focus.
|
- [#473] Tape 'Preferences' cause loss of focus.
|
||||||
- [#485] Error when drawing a curved path.
|
- [#485] Error when drawing a curved path.
|
||||||
|
- [#491] Valentina doesn't update fractional separator.
|
||||||
|
|
||||||
# Version 0.4.4 April 12, 2016
|
# Version 0.4.4 April 12, 2016
|
||||||
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.
|
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.
|
||||||
|
|
|
@ -410,7 +410,7 @@ void MApplication::InitTrVars()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
trVars = new VTranslateVars(TapeSettings()->GetOsSeparator());
|
trVars = new VTranslateVars();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1284,7 +1284,7 @@ void TMainWindow::ShowMData()
|
||||||
QString formula;
|
QString formula;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula());
|
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula(), qApp->Settings()->GetOsSeparator());
|
||||||
}
|
}
|
||||||
catch (qmu::QmuParserError &e)
|
catch (qmu::QmuParserError &e)
|
||||||
{
|
{
|
||||||
|
@ -1470,7 +1470,7 @@ void TMainWindow::SaveMValue()
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
const QString formula = qApp->TrVars()->FormulaFromUser(text, true);
|
const QString formula = qApp->TrVars()->FormulaFromUser(text, qApp->Settings()->GetOsSeparator());
|
||||||
m->SetMValue(nameField->data(Qt::UserRole).toString(), formula);
|
m->SetMValue(nameField->data(Qt::UserRole).toString(), formula);
|
||||||
}
|
}
|
||||||
catch (qmu::QmuParserError &e) // Just in case something bad will happen
|
catch (qmu::QmuParserError &e) // Just in case something bad will happen
|
||||||
|
@ -2216,7 +2216,7 @@ void TMainWindow::RefreshTable()
|
||||||
QString formula;
|
QString formula;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula());
|
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula(), qApp->Settings()->GetOsSeparator());
|
||||||
}
|
}
|
||||||
catch (qmu::QmuParserError &e)
|
catch (qmu::QmuParserError &e)
|
||||||
{
|
{
|
||||||
|
@ -2372,7 +2372,7 @@ bool TMainWindow::EvalFormula(const QString &formula, bool fromUser, VContainer
|
||||||
QString f;
|
QString f;
|
||||||
if (fromUser)
|
if (fromUser)
|
||||||
{
|
{
|
||||||
f = qApp->TrVars()->FormulaFromUser(formula, true);
|
f = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->GetOsSeparator());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -613,7 +613,7 @@ void VApplication::InitTrVars()
|
||||||
{
|
{
|
||||||
if (trVars == nullptr)
|
if (trVars == nullptr)
|
||||||
{
|
{
|
||||||
trVars = new VTranslateVars(ValentinaSettings()->GetOsSeparator());
|
trVars = new VTranslateVars();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -145,7 +145,7 @@ void DialogIncrements::FillIncrements()
|
||||||
QString formula;
|
QString formula;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula());
|
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula(), qApp->Settings()->GetOsSeparator());
|
||||||
}
|
}
|
||||||
catch (qmu::QmuParserError &e)
|
catch (qmu::QmuParserError &e)
|
||||||
{
|
{
|
||||||
|
@ -771,7 +771,7 @@ void DialogIncrements::ShowIncrementDetails()
|
||||||
QString formula;
|
QString formula;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula());
|
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula(), qApp->Settings()->GetOsSeparator());
|
||||||
}
|
}
|
||||||
catch (qmu::QmuParserError &e)
|
catch (qmu::QmuParserError &e)
|
||||||
{
|
{
|
||||||
|
|
|
@ -43,8 +43,14 @@ VFormula::VFormula()
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VFormula::VFormula(const QString &formula, const VContainer *container)
|
VFormula::VFormula(const QString &formula, const VContainer *container)
|
||||||
:formula(qApp->TrVars()->FormulaToUser(formula)), value(QString(tr("Error"))), checkZero(true), data(container),
|
: formula(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator())),
|
||||||
toolId(NULL_ID), postfix(QString()), _error(true), dValue(0)
|
value(QString(tr("Error"))),
|
||||||
|
checkZero(true),
|
||||||
|
data(container),
|
||||||
|
toolId(NULL_ID),
|
||||||
|
postfix(QString()),
|
||||||
|
_error(true),
|
||||||
|
dValue(0)
|
||||||
{
|
{
|
||||||
this->formula.replace("\n", " ");// Replace line return with spaces for calc if exist
|
this->formula.replace("\n", " ");// Replace line return with spaces for calc if exist
|
||||||
Eval();
|
Eval();
|
||||||
|
@ -114,7 +120,7 @@ void VFormula::SetFormula(const QString &value, FormulaType type)
|
||||||
{
|
{
|
||||||
if (type == FormulaType::ToUser)
|
if (type == FormulaType::ToUser)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
using namespace qmu;
|
using namespace qmu;
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VTranslateVars::VTranslateVars(bool osSeparator)
|
VTranslateVars::VTranslateVars()
|
||||||
:VTranslateMeasurements(),
|
:VTranslateMeasurements(),
|
||||||
PMSystemNames(QMap<QString, QmuTranslation>()),
|
PMSystemNames(QMap<QString, QmuTranslation>()),
|
||||||
PMSystemAuthors(QMap<QString, QmuTranslation>()),
|
PMSystemAuthors(QMap<QString, QmuTranslation>()),
|
||||||
|
@ -48,8 +48,7 @@ VTranslateVars::VTranslateVars(bool osSeparator)
|
||||||
variables(QMap<QString, QmuTranslation>()),
|
variables(QMap<QString, QmuTranslation>()),
|
||||||
functions(QMap<QString, QmuTranslation>()),
|
functions(QMap<QString, QmuTranslation>()),
|
||||||
postfixOperators(QMap<QString, QmuTranslation>()),
|
postfixOperators(QMap<QString, QmuTranslation>()),
|
||||||
stDescriptions(QMap<QString, QmuTranslation>()),
|
stDescriptions(QMap<QString, QmuTranslation>())
|
||||||
osSeparator(osSeparator)
|
|
||||||
{
|
{
|
||||||
InitPatternMakingSystems();
|
InitPatternMakingSystems();
|
||||||
InitVariables();
|
InitVariables();
|
||||||
|
@ -803,7 +802,7 @@ QString VTranslateVars::TryFormulaFromUser(const QString &formula, bool osSepara
|
||||||
* @param formula expression that need translate
|
* @param formula expression that need translate
|
||||||
* @return translated expression
|
* @return translated expression
|
||||||
*/
|
*/
|
||||||
QString VTranslateVars::FormulaToUser(const QString &formula) const
|
QString VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) const
|
||||||
{
|
{
|
||||||
if (formula.isEmpty())
|
if (formula.isEmpty())
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
class VTranslateVars : public VTranslateMeasurements
|
class VTranslateVars : public VTranslateMeasurements
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit VTranslateVars(bool osSeparator);
|
explicit VTranslateVars();
|
||||||
virtual ~VTranslateVars() Q_DECL_OVERRIDE;
|
virtual ~VTranslateVars() Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
bool VariablesFromUser(QString &newFormula, int position, const QString &token, int &bias) const;
|
bool VariablesFromUser(QString &newFormula, int position, const QString &token, int &bias) const;
|
||||||
|
@ -55,7 +55,7 @@ public:
|
||||||
|
|
||||||
QString FormulaFromUser(const QString &formula, bool osSeparator) const;
|
QString FormulaFromUser(const QString &formula, bool osSeparator) const;
|
||||||
QString TryFormulaFromUser(const QString &formula, bool osSeparator) const;
|
QString TryFormulaFromUser(const QString &formula, bool osSeparator) const;
|
||||||
QString FormulaToUser(const QString &formula) const;
|
QString FormulaToUser(const QString &formula, bool osSeparator) const;
|
||||||
|
|
||||||
virtual void Retranslate() Q_DECL_OVERRIDE;
|
virtual void Retranslate() Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
@ -68,7 +68,6 @@ private:
|
||||||
QMap<QString, qmu::QmuTranslation> functions;
|
QMap<QString, qmu::QmuTranslation> functions;
|
||||||
QMap<QString, qmu::QmuTranslation> postfixOperators;
|
QMap<QString, qmu::QmuTranslation> postfixOperators;
|
||||||
QMap<QString, qmu::QmuTranslation> stDescriptions;
|
QMap<QString, qmu::QmuTranslation> stDescriptions;
|
||||||
bool osSeparator;
|
|
||||||
|
|
||||||
void InitPatternMakingSystems();
|
void InitPatternMakingSystems();
|
||||||
void InitVariables();
|
void InitVariables();
|
||||||
|
|
|
@ -323,7 +323,7 @@ void DialogEditWrongFormula::showEvent(QShowEvent *event)
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogEditWrongFormula::SetFormula(const QString &value)
|
void DialogEditWrongFormula::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
||||||
// of this PlainTextEdit to change 80 to this value
|
// of this PlainTextEdit to change 80 to this value
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
|
|
|
@ -250,7 +250,7 @@ void DialogAlongLine::SetFirstPointId(const quint32 &value)
|
||||||
*/
|
*/
|
||||||
void DialogAlongLine::SetFormula(const QString &value)
|
void DialogAlongLine::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -135,7 +135,7 @@ void DialogArc::SetCenter(const quint32 &value)
|
||||||
*/
|
*/
|
||||||
void DialogArc::SetF2(const QString &value)
|
void DialogArc::SetF2(const QString &value)
|
||||||
{
|
{
|
||||||
f2 = qApp->TrVars()->FormulaToUser(value);
|
f2 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (f2.length() > 80)
|
if (f2.length() > 80)
|
||||||
{
|
{
|
||||||
|
@ -169,7 +169,7 @@ void DialogArc::SetColor(const QString &value)
|
||||||
*/
|
*/
|
||||||
void DialogArc::SetF1(const QString &value)
|
void DialogArc::SetF1(const QString &value)
|
||||||
{
|
{
|
||||||
f1 = qApp->TrVars()->FormulaToUser(value);
|
f1 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (f1.length() > 80)
|
if (f1.length() > 80)
|
||||||
{
|
{
|
||||||
|
@ -191,7 +191,7 @@ void DialogArc::SetF1(const QString &value)
|
||||||
*/
|
*/
|
||||||
void DialogArc::SetRadius(const QString &value)
|
void DialogArc::SetRadius(const QString &value)
|
||||||
{
|
{
|
||||||
radius = qApp->TrVars()->FormulaToUser(value);
|
radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (radius.length() > 80)
|
if (radius.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -116,7 +116,7 @@ QString DialogArcWithLength::GetRadius() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogArcWithLength::SetRadius(const QString &value)
|
void DialogArcWithLength::SetRadius(const QString &value)
|
||||||
{
|
{
|
||||||
radius = qApp->TrVars()->FormulaToUser(value);
|
radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (radius.length() > 80)
|
if (radius.length() > 80)
|
||||||
{
|
{
|
||||||
|
@ -139,7 +139,7 @@ QString DialogArcWithLength::GetF1() const
|
||||||
|
|
||||||
void DialogArcWithLength::SetF1(const QString &value)
|
void DialogArcWithLength::SetF1(const QString &value)
|
||||||
{
|
{
|
||||||
f1 = qApp->TrVars()->FormulaToUser(value);
|
f1 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (f1.length() > 80)
|
if (f1.length() > 80)
|
||||||
{
|
{
|
||||||
|
@ -163,7 +163,7 @@ QString DialogArcWithLength::GetLength() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogArcWithLength::SetLength(const QString &value)
|
void DialogArcWithLength::SetLength(const QString &value)
|
||||||
{
|
{
|
||||||
length = qApp->TrVars()->FormulaToUser(value);
|
length = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (length.length() > 80)
|
if (length.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -237,7 +237,7 @@ void DialogBisector::SetTypeLine(const QString &value)
|
||||||
*/
|
*/
|
||||||
void DialogBisector::SetFormula(const QString &value)
|
void DialogBisector::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -110,7 +110,7 @@ QString DialogCurveIntersectAxis::GetAngle() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogCurveIntersectAxis::SetAngle(const QString &value)
|
void DialogCurveIntersectAxis::SetAngle(const QString &value)
|
||||||
{
|
{
|
||||||
formulaAngle = qApp->TrVars()->FormulaToUser(value);
|
formulaAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
||||||
// of this PlainTextEdit to change 80 to this value
|
// of this PlainTextEdit to change 80 to this value
|
||||||
if (formulaAngle.length() > 80)
|
if (formulaAngle.length() > 80)
|
||||||
|
|
|
@ -198,7 +198,7 @@ void DialogCutArc::SetChildrenId(const quint32 &ch1, const quint32 &ch2)
|
||||||
*/
|
*/
|
||||||
void DialogCutArc::SetFormula(const QString &value)
|
void DialogCutArc::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -97,7 +97,7 @@ void DialogCutSpline::SetPointName(const QString &value)
|
||||||
*/
|
*/
|
||||||
void DialogCutSpline::SetFormula(const QString &value)
|
void DialogCutSpline::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
||||||
// of this PlainTextEdit to change 80 to this value
|
// of this PlainTextEdit to change 80 to this value
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
|
|
|
@ -97,7 +97,7 @@ void DialogCutSplinePath::SetPointName(const QString &value)
|
||||||
*/
|
*/
|
||||||
void DialogCutSplinePath::SetFormula(const QString &value)
|
void DialogCutSplinePath::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
||||||
// of this PlainTextEdit to change 80 to this value
|
// of this PlainTextEdit to change 80 to this value
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
|
|
|
@ -203,7 +203,7 @@ void DialogEndLine::SetTypeLine(const QString &value)
|
||||||
*/
|
*/
|
||||||
void DialogEndLine::SetFormula(const QString &value)
|
void DialogEndLine::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formulaLength = qApp->TrVars()->FormulaToUser(value);
|
formulaLength = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
||||||
// of this PlainTextEdit to change 80 to this value
|
// of this PlainTextEdit to change 80 to this value
|
||||||
if (formulaLength.length() > 80)
|
if (formulaLength.length() > 80)
|
||||||
|
@ -226,7 +226,7 @@ void DialogEndLine::SetFormula(const QString &value)
|
||||||
*/
|
*/
|
||||||
void DialogEndLine::SetAngle(const QString &value)
|
void DialogEndLine::SetAngle(const QString &value)
|
||||||
{
|
{
|
||||||
formulaAngle = qApp->TrVars()->FormulaToUser(value);
|
formulaAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
||||||
// of this PlainTextEdit to change 80 to this value
|
// of this PlainTextEdit to change 80 to this value
|
||||||
if (formulaAngle.length() > 80)
|
if (formulaAngle.length() > 80)
|
||||||
|
|
|
@ -119,7 +119,7 @@ QString DialogLineIntersectAxis::GetAngle() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogLineIntersectAxis::SetAngle(const QString &value)
|
void DialogLineIntersectAxis::SetAngle(const QString &value)
|
||||||
{
|
{
|
||||||
formulaAngle = qApp->TrVars()->FormulaToUser(value);
|
formulaAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
// increase height if needed. TODO : see if I can get the max number of caracters in one line
|
||||||
// of this PlainTextEdit to change 80 to this value
|
// of this PlainTextEdit to change 80 to this value
|
||||||
if (formulaAngle.length() > 80)
|
if (formulaAngle.length() > 80)
|
||||||
|
|
|
@ -268,7 +268,7 @@ void DialogNormal::SetAngle(const qreal &value)
|
||||||
*/
|
*/
|
||||||
void DialogNormal::SetFormula(const QString &value)
|
void DialogNormal::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -125,7 +125,7 @@ QString DialogPointFromCircleAndTangent::GetCircleRadius() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogPointFromCircleAndTangent::SetCircleRadius(const QString &value)
|
void DialogPointFromCircleAndTangent::SetCircleRadius(const QString &value)
|
||||||
{
|
{
|
||||||
const QString formula = qApp->TrVars()->FormulaToUser(value);
|
const QString formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -277,7 +277,7 @@ void DialogPointOfContact::setCenter(const quint32 &value)
|
||||||
*/
|
*/
|
||||||
void DialogPointOfContact::setRadius(const QString &value)
|
void DialogPointOfContact::setRadius(const QString &value)
|
||||||
{
|
{
|
||||||
radius = qApp->TrVars()->FormulaToUser(value);
|
radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (radius.length() > 80)
|
if (radius.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -157,7 +157,7 @@ QString DialogPointOfIntersectionCircles::GetFirstCircleRadius() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogPointOfIntersectionCircles::SetFirstCircleRadius(const QString &value)
|
void DialogPointOfIntersectionCircles::SetFirstCircleRadius(const QString &value)
|
||||||
{
|
{
|
||||||
const QString formula = qApp->TrVars()->FormulaToUser(value);
|
const QString formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
@ -182,7 +182,7 @@ QString DialogPointOfIntersectionCircles::GetSecondCircleRadius() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogPointOfIntersectionCircles::SetSecondCircleRadius(const QString &value)
|
void DialogPointOfIntersectionCircles::SetSecondCircleRadius(const QString &value)
|
||||||
{
|
{
|
||||||
const QString formula = qApp->TrVars()->FormulaToUser(value);
|
const QString formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -295,7 +295,7 @@ void DialogShoulderPoint::SetP1Line(const quint32 &value)
|
||||||
*/
|
*/
|
||||||
void DialogShoulderPoint::SetFormula(const QString &value)
|
void DialogShoulderPoint::SetFormula(const QString &value)
|
||||||
{
|
{
|
||||||
formula = qApp->TrVars()->FormulaToUser(value);
|
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
|
||||||
// increase height if needed.
|
// increase height if needed.
|
||||||
if (formula.length() > 80)
|
if (formula.length() > 80)
|
||||||
{
|
{
|
||||||
|
|
|
@ -356,9 +356,9 @@ void VToolArc::SetVisualization()
|
||||||
|
|
||||||
const VTranslateVars *trVars = qApp->TrVars();
|
const VTranslateVars *trVars = qApp->TrVars();
|
||||||
visual->setPoint1Id(arc->GetCenter().id());
|
visual->setPoint1Id(arc->GetCenter().id());
|
||||||
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius()));
|
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1()));
|
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setF2(trVars->FormulaToUser(arc->GetFormulaF2()));
|
visual->setF2(trVars->FormulaToUser(arc->GetFormulaF2(), qApp->Settings()->GetOsSeparator()));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -312,9 +312,9 @@ void VToolArcWithLength::SetVisualization()
|
||||||
|
|
||||||
const VTranslateVars *trVars = qApp->TrVars();
|
const VTranslateVars *trVars = qApp->TrVars();
|
||||||
visual->setPoint1Id(arc->GetCenter().id());
|
visual->setPoint1Id(arc->GetCenter().id());
|
||||||
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius()));
|
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1()));
|
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setLength(trVars->FormulaToUser(arc->GetFormulaLength()));
|
visual->setLength(trVars->FormulaToUser(arc->GetFormulaLength(), qApp->Settings()->GetOsSeparator()));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -242,7 +242,7 @@ void VToolCutArc::SetVisualization()
|
||||||
SCASSERT(visual != nullptr);
|
SCASSERT(visual != nullptr);
|
||||||
|
|
||||||
visual->setPoint1Id(curveCutId);
|
visual->setPoint1Id(curveCutId);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formula));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -250,7 +250,7 @@ void VToolCutSpline::SetVisualization()
|
||||||
SCASSERT(visual != nullptr);
|
SCASSERT(visual != nullptr);
|
||||||
|
|
||||||
visual->setPoint1Id(curveCutId);
|
visual->setPoint1Id(curveCutId);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formula));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -294,7 +294,7 @@ void VToolCutSplinePath::SetVisualization()
|
||||||
SCASSERT(visual != nullptr);
|
SCASSERT(visual != nullptr);
|
||||||
|
|
||||||
visual->setPoint1Id(curveCutId);
|
visual->setPoint1Id(curveCutId);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formula));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -146,7 +146,7 @@ void VToolAlongLine::SetVisualization()
|
||||||
SCASSERT(visual != nullptr)
|
SCASSERT(visual != nullptr)
|
||||||
visual->setPoint1Id(basePointId);
|
visual->setPoint1Id(basePointId);
|
||||||
visual->setPoint2Id(secondPointId);
|
visual->setPoint2Id(secondPointId);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
|
|
|
@ -308,7 +308,7 @@ void VToolBisector::SetVisualization()
|
||||||
visual->setPoint1Id(firstPointId);
|
visual->setPoint1Id(firstPointId);
|
||||||
visual->setPoint2Id(basePointId);
|
visual->setPoint2Id(basePointId);
|
||||||
visual->setPoint3Id(thirdPointId);
|
visual->setPoint3Id(thirdPointId);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
|
|
|
@ -280,7 +280,7 @@ void VToolCurveIntersectAxis::SetVisualization()
|
||||||
|
|
||||||
visual->setPoint1Id(curveId);
|
visual->setPoint1Id(curveId);
|
||||||
visual->setAxisPointId(basePointId);
|
visual->setAxisPointId(basePointId);
|
||||||
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle));
|
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
|
|
|
@ -241,8 +241,8 @@ void VToolEndLine::SetVisualization()
|
||||||
SCASSERT(visual != nullptr);
|
SCASSERT(visual != nullptr);
|
||||||
|
|
||||||
visual->setPoint1Id(basePointId);
|
visual->setPoint1Id(basePointId);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle));
|
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
|
|
|
@ -295,7 +295,7 @@ void VToolLineIntersectAxis::SetVisualization()
|
||||||
visual->setPoint1Id(firstPointId);
|
visual->setPoint1Id(firstPointId);
|
||||||
visual->setPoint2Id(secondPointId);
|
visual->setPoint2Id(secondPointId);
|
||||||
visual->setAxisPointId(basePointId);
|
visual->setAxisPointId(basePointId);
|
||||||
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle));
|
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
|
|
|
@ -282,7 +282,7 @@ void VToolNormal::SetVisualization()
|
||||||
|
|
||||||
visual->setPoint1Id(basePointId);
|
visual->setPoint1Id(basePointId);
|
||||||
visual->setPoint2Id(secondPointId);
|
visual->setPoint2Id(secondPointId);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->SetAngle(angle);
|
visual->SetAngle(angle);
|
||||||
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
|
|
|
@ -312,7 +312,7 @@ void VToolShoulderPoint::SetVisualization()
|
||||||
visual->setPoint1Id(pShoulder);
|
visual->setPoint1Id(pShoulder);
|
||||||
visual->setLineP1Id(basePointId);
|
visual->setLineP1Id(basePointId);
|
||||||
visual->setLineP2Id(p2Line);
|
visual->setLineP2Id(p2Line);
|
||||||
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
|
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
|
|
|
@ -325,7 +325,7 @@ void VToolPointOfContact::SetVisualization()
|
||||||
visual->setPoint1Id(firstPointId);
|
visual->setPoint1Id(firstPointId);
|
||||||
visual->setLineP2Id(secondPointId);
|
visual->setLineP2Id(secondPointId);
|
||||||
visual->setRadiusId(center);
|
visual->setRadiusId(center);
|
||||||
visual->setRadius(qApp->TrVars()->FormulaToUser(arcRadius));
|
visual->setRadius(qApp->TrVars()->FormulaToUser(arcRadius, qApp->Settings()->GetOsSeparator()));
|
||||||
visual->RefreshGeometry();
|
visual->RefreshGeometry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -568,7 +568,7 @@ void TST_MeasurementRegExp::InitTrMs()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
trMs = new VTranslateVars(true);
|
trMs = new VTranslateVars();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user