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 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-05-23 18:18:16 +03:00
parent 6489c34b23
commit 643c60cc70
38 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -2,6 +2,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

@ -1284,7 +1284,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)
{
@ -1470,7 +1470,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
@ -2216,7 +2216,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)
{
@ -2372,7 +2372,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

@ -145,7 +145,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)
{
@ -771,7 +771,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();
@ -803,7 +802,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

@ -323,7 +323,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

@ -198,7 +198,7 @@ void DialogCutArc::SetChildrenId(const quint32 &ch1, const quint32 &ch2)
*/
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

@ -97,7 +97,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

@ -97,7 +97,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/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)
{

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

@ -356,9 +356,9 @@ void VToolArc::SetVisualization()
const VTranslateVars *trVars = qApp->TrVars();
visual->setPoint1Id(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

@ -312,9 +312,9 @@ void VToolArcWithLength::SetVisualization()
const VTranslateVars *trVars = qApp->TrVars();
visual->setPoint1Id(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

@ -242,7 +242,7 @@ void VToolCutArc::SetVisualization()
SCASSERT(visual != nullptr);
visual->setPoint1Id(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

@ -250,7 +250,7 @@ void VToolCutSpline::SetVisualization()
SCASSERT(visual != nullptr);
visual->setPoint1Id(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

@ -294,7 +294,7 @@ void VToolCutSplinePath::SetVisualization()
SCASSERT(visual != nullptr);
visual->setPoint1Id(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->setPoint1Id(basePointId);
visual->setPoint2Id(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

@ -308,7 +308,7 @@ void VToolBisector::SetVisualization()
visual->setPoint1Id(firstPointId);
visual->setPoint2Id(basePointId);
visual->setPoint3Id(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

@ -280,7 +280,7 @@ void VToolCurveIntersectAxis::SetVisualization()
visual->setPoint1Id(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

@ -241,8 +241,8 @@ void VToolEndLine::SetVisualization()
SCASSERT(visual != nullptr);
visual->setPoint1Id(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

@ -295,7 +295,7 @@ void VToolLineIntersectAxis::SetVisualization()
visual->setPoint1Id(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

@ -282,7 +282,7 @@ void VToolNormal::SetVisualization()
visual->setPoint1Id(basePointId);
visual->setPoint2Id(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

@ -312,7 +312,7 @@ void VToolShoulderPoint::SetVisualization()
visual->setPoint1Id(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

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

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();
}
}