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

Fixed issue #491. Valentina doesn't update fractional separator.

Browse Source 
(grafted from c658843945e37cd7f1d3e4e0ca4967d7a01b1c4d)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-05-23 18:23:39 +03:00
parent 64f72c69d5
commit b820d5a6ea
43 changed files with 112 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -29,6 +29,7 @@
- [#435] Valentina doesn't change the cursor.
- [#473] Tape 'Preferences' cause loss of focus.
- [#485] Error when drawing a curved path.
- [#491] Valentina doesn't update fractional separator.
# Version 0.4.4 April 12, 2016
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

2
src/app/tape/mapplication.cpp
View File

@ -410,7 +410,7 @@ void MApplication::InitTrVars()
}
else
{
trVars = new VTranslateVars(TapeSettings()->GetOsSeparator());
trVars = new VTranslateVars();
}
}

8
src/app/tape/tmainwindow.cpp
View File

@ -1292,7 +1292,7 @@ void TMainWindow::ShowMData()
QString formula;
try
{
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula());
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula(), qApp->Settings()->GetOsSeparator());
}
catch (qmu::QmuParserError &e)
{
@ -1478,7 +1478,7 @@ void TMainWindow::SaveMValue()
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);
}
catch (qmu::QmuParserError &e) // Just in case something bad will happen
@ -2254,7 +2254,7 @@ void TMainWindow::RefreshTable()
QString formula;
try
{
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula());
formula = qApp->TrVars()->FormulaToUser(meash->GetFormula(), qApp->Settings()->GetOsSeparator());
}
catch (qmu::QmuParserError &e)
{
@ -2410,7 +2410,7 @@ bool TMainWindow::EvalFormula(const QString &formula, bool fromUser, VContainer
QString f;
if (fromUser)
{
f = qApp->TrVars()->FormulaFromUser(formula, true);
f = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->GetOsSeparator());
}
else
{

2
src/app/valentina/core/vapplication.cpp
View File

@ -613,7 +613,7 @@ void VApplication::InitTrVars()
{
if (trVars == nullptr)
{
trVars = new VTranslateVars(ValentinaSettings()->GetOsSeparator());
trVars = new VTranslateVars();
}
}

4
src/app/valentina/dialogs/dialogincrements.cpp
View File

@ -143,7 +143,7 @@ void DialogIncrements::FillIncrements()
QString formula;
try
{
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula());
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula(), qApp->Settings()->GetOsSeparator());
}
catch (qmu::QmuParserError &e)
{
@ -748,7 +748,7 @@ void DialogIncrements::ShowIncrementDetails()
QString formula;
try
{
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula());
formula = qApp->TrVars()->FormulaToUser(incr->GetFormula(), qApp->Settings()->GetOsSeparator());
}
catch (qmu::QmuParserError &e)
{

12
src/libs/vpatterndb/vformula.cpp
View File

@ -43,8 +43,14 @@ VFormula::VFormula()
//---------------------------------------------------------------------------------------------------------------------
VFormula::VFormula(const QString &formula, const VContainer *container)
:formula(qApp->TrVars()->FormulaToUser(formula)), value(QString(tr("Error"))), checkZero(true), data(container),
toolId(NULL_ID), postfix(QString()), _error(true), dValue(0)
: formula(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator())),
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
Eval();
@ -114,7 +120,7 @@ void VFormula::SetFormula(const QString &value, FormulaType type)
{
if (type == FormulaType::ToUser)
{
formula = qApp->TrVars()->FormulaToUser(value);
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
}
else
{

7
src/libs/vpatterndb/vtranslatevars.cpp
View File

@ -40,7 +40,7 @@
using namespace qmu;
//---------------------------------------------------------------------------------------------------------------------
VTranslateVars::VTranslateVars(bool osSeparator)
VTranslateVars::VTranslateVars()
:VTranslateMeasurements(),
PMSystemNames(QMap<QString, QmuTranslation>()),
PMSystemAuthors(QMap<QString, QmuTranslation>()),
@ -48,8 +48,7 @@ VTranslateVars::VTranslateVars(bool osSeparator)
variables(QMap<QString, QmuTranslation>()),
functions(QMap<QString, QmuTranslation>()),
postfixOperators(QMap<QString, QmuTranslation>()),
stDescriptions(QMap<QString, QmuTranslation>()),
osSeparator(osSeparator)
stDescriptions(QMap<QString, QmuTranslation>())
{
InitPatternMakingSystems();
InitVariables();
@ -804,7 +803,7 @@ QString VTranslateVars::TryFormulaFromUser(const QString &formula, bool osSepara
* @param formula expression that need translate
* @return translated expression
*/
QString VTranslateVars::FormulaToUser(const QString &formula) const
QString VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) const
{
if (formula.isEmpty())
{

5
src/libs/vpatterndb/vtranslatevars.h
View File

@ -34,7 +34,7 @@
class VTranslateVars : public VTranslateMeasurements
{
public:
explicit VTranslateVars(bool osSeparator);
explicit VTranslateVars();
virtual ~VTranslateVars() Q_DECL_OVERRIDE;
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 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;
@ -68,7 +68,6 @@ private:
QMap<QString, qmu::QmuTranslation> functions;
QMap<QString, qmu::QmuTranslation> postfixOperators;
QMap<QString, qmu::QmuTranslation> stDescriptions;
bool osSeparator;
void InitPatternMakingSystems();
void InitVariables();

2
src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
View File

@ -298,7 +298,7 @@ void DialogEditWrongFormula::showEvent(QShowEvent *event)
//---------------------------------------------------------------------------------------------------------------------
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
// of this PlainTextEdit to change 80 to this value
if (formula.length() > 80)

2
src/libs/vtools/dialogs/tools/dialogalongline.cpp
View File

@ -250,7 +250,7 @@ void DialogAlongLine::SetFirstPointId(const quint32 &value)
*/
void DialogAlongLine::SetFormula(const QString &value)
{
formula = qApp->TrVars()->FormulaToUser(value);
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{

6
src/libs/vtools/dialogs/tools/dialogarc.cpp
View File

@ -135,7 +135,7 @@ void DialogArc::SetCenter(const quint32 &value)
*/
void DialogArc::SetF2(const QString &value)
{
f2 = qApp->TrVars()->FormulaToUser(value);
f2 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (f2.length() > 80)
{
@ -169,7 +169,7 @@ void DialogArc::SetColor(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.
if (f1.length() > 80)
{
@ -191,7 +191,7 @@ void DialogArc::SetF1(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.
if (radius.length() > 80)
{

6
src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
View File

@ -116,7 +116,7 @@ QString DialogArcWithLength::GetRadius() const
//---------------------------------------------------------------------------------------------------------------------
void DialogArcWithLength::SetRadius(const QString &value)
{
radius = qApp->TrVars()->FormulaToUser(value);
radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (radius.length() > 80)
{
@ -139,7 +139,7 @@ QString DialogArcWithLength::GetF1() const
void DialogArcWithLength::SetF1(const QString &value)
{
f1 = qApp->TrVars()->FormulaToUser(value);
f1 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (f1.length() > 80)
{
@ -163,7 +163,7 @@ QString DialogArcWithLength::GetLength() const
//---------------------------------------------------------------------------------------------------------------------
void DialogArcWithLength::SetLength(const QString &value)
{
length = qApp->TrVars()->FormulaToUser(value);
length = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (length.length() > 80)
{

2
src/libs/vtools/dialogs/tools/dialogbisector.cpp
View File

@ -237,7 +237,7 @@ void DialogBisector::SetTypeLine(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.
if (formula.length() > 80)
{

2
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -110,7 +110,7 @@ QString DialogCurveIntersectAxis::GetAngle() const
//---------------------------------------------------------------------------------------------------------------------
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
// of this PlainTextEdit to change 80 to this value
if (formulaAngle.length() > 80)

2
src/libs/vtools/dialogs/tools/dialogcutarc.cpp
View File

@ -176,7 +176,7 @@ void DialogCutArc::setArcId(const quint32 &value)
*/
void DialogCutArc::SetFormula(const QString &value)
{
formula = qApp->TrVars()->FormulaToUser(value);
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{

2
src/libs/vtools/dialogs/tools/dialogcutspline.cpp
View File

@ -95,7 +95,7 @@ void DialogCutSpline::SetPointName(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
// of this PlainTextEdit to change 80 to this value
if (formula.length() > 80)

2
src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
View File

@ -95,7 +95,7 @@ void DialogCutSplinePath::SetPointName(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
// of this PlainTextEdit to change 80 to this value
if (formula.length() > 80)

4
src/libs/vtools/dialogs/tools/dialogendline.cpp
View File

@ -203,7 +203,7 @@ void DialogEndLine::SetTypeLine(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
// of this PlainTextEdit to change 80 to this value
if (formulaLength.length() > 80)
@ -226,7 +226,7 @@ void DialogEndLine::SetFormula(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
// of this PlainTextEdit to change 80 to this value
if (formulaAngle.length() > 80)

2
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -119,7 +119,7 @@ QString DialogLineIntersectAxis::GetAngle() const
//---------------------------------------------------------------------------------------------------------------------
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
// of this PlainTextEdit to change 80 to this value
if (formulaAngle.length() > 80)

2
src/libs/vtools/dialogs/tools/dialognormal.cpp
View File

@ -268,7 +268,7 @@ void DialogNormal::SetAngle(const qreal &value)
*/
void DialogNormal::SetFormula(const QString &value)
{
formula = qApp->TrVars()->FormulaToUser(value);
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{

2
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
View File

@ -125,7 +125,7 @@ QString DialogPointFromCircleAndTangent::GetCircleRadius() const
//---------------------------------------------------------------------------------------------------------------------
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.
if (formula.length() > 80)
{

2
src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
View File

@ -277,7 +277,7 @@ void DialogPointOfContact::setCenter(const quint32 &value)
*/
void DialogPointOfContact::setRadius(const QString &value)
{
radius = qApp->TrVars()->FormulaToUser(value);
radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (radius.length() > 80)
{

4
src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
View File

@ -157,7 +157,7 @@ QString DialogPointOfIntersectionCircles::GetFirstCircleRadius() const
//---------------------------------------------------------------------------------------------------------------------
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.
if (formula.length() > 80)
{
@ -182,7 +182,7 @@ QString DialogPointOfIntersectionCircles::GetSecondCircleRadius() const
//---------------------------------------------------------------------------------------------------------------------
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.
if (formula.length() > 80)
{

2
src/libs/vtools/dialogs/tools/dialogrotation.cpp
View File

@ -108,7 +108,7 @@ QString DialogRotation::GetAngle() const
//---------------------------------------------------------------------------------------------------------------------
void DialogRotation::SetAngle(const QString &value)
{
formulaAngle = qApp->TrVars()->FormulaToUser(value);
formulaAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (formulaAngle.length() > 80)
{

2
src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -295,7 +295,7 @@ void DialogShoulderPoint::SetP1Line(const quint32 &value)
*/
void DialogShoulderPoint::SetFormula(const QString &value)
{
formula = qApp->TrVars()->FormulaToUser(value);
formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{

32
src/libs/vtools/dialogs/tools/dialogspline.cpp
View File

@ -273,7 +273,7 @@ void DialogSpline::FXAngle1()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (angle1F.length() > 80)
{
@ -296,7 +296,7 @@ void DialogSpline::FXAngle2()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (angle2F.length() > 80)
{
@ -319,7 +319,7 @@ void DialogSpline::FXLength1()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
length1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
length1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (length1F.length() > 80)
{
@ -342,7 +342,7 @@ void DialogSpline::FXLength2()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
length2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
length2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (length2F.length() > 80)
{
@ -505,13 +505,17 @@ void DialogSpline::ShowDialog(bool click)
spl = VSpline(*GetP1(), path->GetP2(), path->GetP3(), *GetP4());
const QString angle1F = qApp->TrVars()->FormulaToUser(spl.GetStartAngleFormula());
const QString angle2F = qApp->TrVars()->FormulaToUser(spl.GetEndAngleFormula());
const QString angle1F = qApp->TrVars()->FormulaToUser(spl.GetStartAngleFormula(),
qApp->Settings()->GetOsSeparator());
const QString angle2F = qApp->TrVars()->FormulaToUser(spl.GetEndAngleFormula(),
qApp->Settings()->GetOsSeparator());
ui->plainTextEditAngle1F->setPlainText(angle1F);
ui->plainTextEditAngle2F->setPlainText(angle2F);
ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(spl.GetC1LengthFormula()));
ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(spl.GetC2LengthFormula()));
ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(spl.GetC1LengthFormula(),
qApp->Settings()->GetOsSeparator()));
ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(spl.GetC2LengthFormula(),
qApp->Settings()->GetOsSeparator()));
if (not data->IsUnique(spl.name()))
{
@ -556,14 +560,18 @@ void DialogSpline::SetSpline(const VSpline &spline)
setCurrentPointId(ui->comboBoxP1, spl.GetP1().id());
setCurrentPointId(ui->comboBoxP4, spl.GetP4().id());
const QString angle1F = qApp->TrVars()->FormulaToUser(spl.GetStartAngleFormula());
const QString angle2F = qApp->TrVars()->FormulaToUser(spl.GetEndAngleFormula());
const QString angle1F = qApp->TrVars()->FormulaToUser(spl.GetStartAngleFormula(),
qApp->Settings()->GetOsSeparator());
const QString angle2F = qApp->TrVars()->FormulaToUser(spl.GetEndAngleFormula(),
qApp->Settings()->GetOsSeparator());
ui->plainTextEditAngle1F->setPlainText(angle1F);
ui->plainTextEditAngle2F->setPlainText(angle2F);
const QString length1F = qApp->TrVars()->FormulaToUser(spl.GetC1LengthFormula());
const QString length2F = qApp->TrVars()->FormulaToUser(spl.GetC2LengthFormula());
const QString length1F = qApp->TrVars()->FormulaToUser(spl.GetC1LengthFormula(),
qApp->Settings()->GetOsSeparator());
const QString length2F = qApp->TrVars()->FormulaToUser(spl.GetC2LengthFormula(),
qApp->Settings()->GetOsSeparator());
ui->plainTextEditLength1F->setPlainText(length1F);
ui->plainTextEditLength2F->setPlainText(length2F);

38
src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
View File

@ -301,7 +301,8 @@ void DialogSplinePath::Angle1Changed()
if (row != ui->listWidget->count()-1)
{
ui->plainTextEditAngle2F->blockSignals(true);
ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula()));
ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula(),
qApp->Settings()->GetOsSeparator()));
EvalAngle2();
ui->plainTextEditAngle2F->blockSignals(false);
}
@ -343,7 +344,8 @@ void DialogSplinePath::Angle2Changed()
if (row != 0)
{
ui->plainTextEditAngle1F->blockSignals(true);
ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula()));
ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula(),
qApp->Settings()->GetOsSeparator()));
EvalAngle1();
ui->plainTextEditAngle1F->blockSignals(false);
}
@ -431,7 +433,7 @@ void DialogSplinePath::FXAngle1()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (angle1F.length() > 80)
{
@ -456,7 +458,7 @@ void DialogSplinePath::FXAngle2()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (angle2F.length() > 80)
{
@ -481,7 +483,7 @@ void DialogSplinePath::FXLength1()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
length1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
length1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (length1F.length() > 80)
{
@ -506,7 +508,7 @@ void DialogSplinePath::FXLength2()
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
length2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula());
length2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
// increase height if needed.
if (length2F.length() > 80)
{
@ -790,9 +792,11 @@ void DialogSplinePath::DataPoint(const VSplinePoint &p)
ui->plainTextEditAngle2F->blockSignals(true);
ui->plainTextEditLength2F->blockSignals(true);
ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula()));
ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula(),
qApp->Settings()->GetOsSeparator()));
EvalAngle2();
ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length2Formula()));
ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length2Formula(),
qApp->Settings()->GetOsSeparator()));
EvalLength2();
ui->plainTextEditAngle2F->blockSignals(false);
ui->plainTextEditLength2F->blockSignals(false);
@ -825,9 +829,11 @@ void DialogSplinePath::DataPoint(const VSplinePoint &p)
ui->plainTextEditAngle1F->blockSignals(true);
ui->plainTextEditLength1F->blockSignals(true);
ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula()));
ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula(),
qApp->Settings()->GetOsSeparator()));
EvalAngle1();
ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length1Formula()));
ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length1Formula(),
qApp->Settings()->GetOsSeparator()));
EvalLength1();
ui->plainTextEditAngle1F->blockSignals(false);
ui->plainTextEditLength1F->blockSignals(false);
@ -849,10 +855,14 @@ void DialogSplinePath::DataPoint(const VSplinePoint &p)
ui->plainTextEditAngle2F->blockSignals(true);
ui->plainTextEditLength2F->blockSignals(true);
ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula()));
ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula()));
ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length1Formula()));
ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length2Formula()));
ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula(),
qApp->Settings()->GetOsSeparator()));
ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula(),
qApp->Settings()->GetOsSeparator()));
ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length1Formula(),
qApp->Settings()->GetOsSeparator()));
ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length2Formula(),
qApp->Settings()->GetOsSeparator()));
EvalAngle1();
EvalLength1();

2
src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
View File

@ -647,7 +647,7 @@ void VToolRotation::SetVisualization()
visual->SetObjects(source);
visual->SetOriginPointId(origPointId);
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle));
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator()));
visual->RefreshGeometry();
}
}

6
src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
View File

@ -350,9 +350,9 @@ void VToolArc::SetVisualization()
const VTranslateVars *trVars = qApp->TrVars();
visual->setObject1Id(arc->GetCenter().id());
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius()));
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1()));
visual->setF2(trVars->FormulaToUser(arc->GetFormulaF2()));
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), qApp->Settings()->GetOsSeparator()));
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), qApp->Settings()->GetOsSeparator()));
visual->setF2(trVars->FormulaToUser(arc->GetFormulaF2(), qApp->Settings()->GetOsSeparator()));
visual->RefreshGeometry();
}
}

6
src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
View File

@ -307,9 +307,9 @@ void VToolArcWithLength::SetVisualization()
const VTranslateVars *trVars = qApp->TrVars();
visual->setObject1Id(arc->GetCenter().id());
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius()));
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1()));
visual->setLength(trVars->FormulaToUser(arc->GetFormulaLength()));
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), qApp->Settings()->GetOsSeparator()));
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), qApp->Settings()->GetOsSeparator()));
visual->setLength(trVars->FormulaToUser(arc->GetFormulaLength(), qApp->Settings()->GetOsSeparator()));
visual->RefreshGeometry();
}
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
View File

@ -224,7 +224,7 @@ void VToolCutArc::SetVisualization()
SCASSERT(visual != nullptr);
visual->setObject1Id(curveCutId);
visual->setLength(qApp->TrVars()->FormulaToUser(formula));
visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator()));
visual->RefreshGeometry();
}
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
View File

@ -222,7 +222,7 @@ void VToolCutSpline::SetVisualization()
SCASSERT(visual != nullptr);
visual->setObject1Id(curveCutId);
visual->setLength(qApp->TrVars()->FormulaToUser(formula));
visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator()));
visual->RefreshGeometry();
}
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
View File

@ -307,7 +307,7 @@ void VToolCutSplinePath::SetVisualization()
SCASSERT(visual != nullptr);
visual->setObject1Id(curveCutId);
visual->setLength(qApp->TrVars()->FormulaToUser(formula));
visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator()));
visual->RefreshGeometry();
}
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
View File

@ -146,7 +146,7 @@ void VToolAlongLine::SetVisualization()
SCASSERT(visual != nullptr)
visual->setObject1Id(basePointId);
visual->setObject2Id(secondPointId);
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
visual->RefreshGeometry();
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
View File

@ -304,7 +304,7 @@ void VToolBisector::SetVisualization()
visual->setObject1Id(firstPointId);
visual->setObject2Id(basePointId);
visual->setObject3Id(thirdPointId);
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
visual->RefreshGeometry();
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
View File

@ -292,7 +292,7 @@ void VToolCurveIntersectAxis::SetVisualization()
visual->setObject1Id(curveId);
visual->setAxisPointId(basePointId);
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle));
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator()));
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
visual->RefreshGeometry();
}

4
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
View File

@ -238,8 +238,8 @@ void VToolEndLine::SetVisualization()
SCASSERT(visual != nullptr);
visual->setObject1Id(basePointId);
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle));
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator()));
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
visual->RefreshGeometry();
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
View File

@ -292,7 +292,7 @@ void VToolLineIntersectAxis::SetVisualization()
visual->setObject1Id(firstPointId);
visual->setPoint2Id(secondPointId);
visual->setAxisPointId(basePointId);
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle));
visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator()));
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
visual->RefreshGeometry();
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
View File

@ -278,7 +278,7 @@ void VToolNormal::SetVisualization()
visual->setObject1Id(basePointId);
visual->setObject2Id(secondPointId);
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
visual->SetAngle(angle);
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
visual->RefreshGeometry();

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
View File

@ -308,7 +308,7 @@ void VToolShoulderPoint::SetVisualization()
visual->setObject1Id(pShoulder);
visual->setLineP1Id(basePointId);
visual->setLineP2Id(p2Line);
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength));
visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator()));
visual->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine));
visual->RefreshGeometry();
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
View File

@ -321,7 +321,7 @@ void VToolPointOfContact::SetVisualization()
visual->setObject1Id(firstPointId);
visual->setLineP2Id(secondPointId);
visual->setRadiusId(center);
visual->setRadius(qApp->TrVars()->FormulaToUser(arcRadius));
visual->setRadius(qApp->TrVars()->FormulaToUser(arcRadius, qApp->Settings()->GetOsSeparator()));
visual->RefreshGeometry();
}
}

3
src/libs/vtools/visualization/line/vistoolendline.cpp
View File

@ -73,7 +73,8 @@ void VisToolEndLine::RefreshGeometry()
Visualization::toolTip = QString(tr("<b>Point at distance and angle</b>: angle = %1°, length = %2%3; "
"<b>Shift</b> - sticking angle, <b>Enter</b> - finish creation"))
.arg(this->line().angle())
.arg(qApp->TrVars()->FormulaToUser(QString::number(qApp->fromPixel(this->line().length()))))
.arg(qApp->TrVars()->FormulaToUser(QString::number(qApp->fromPixel(this->line().length())),
qApp->Settings()->GetOsSeparator()))
.arg(prefix);
}

2
src/test/ValentinaTest/tst_measurementregexp.cpp
View File

@ -568,7 +568,7 @@ void TST_MeasurementRegExp::InitTrMs()
}
else
{
trMs = new VTranslateVars(true);
trMs = new VTranslateVars();
}
}