From 19400f5b838ed1d08605299b957146e979ad9ccd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 25 Jan 2017 14:20:25 +0200 Subject: [PATCH] A seam allowance value can be 0. --HG-- branch : feature --- src/libs/vtools/dialogs/tools/dialogpiecepath.cpp | 6 +++--- src/libs/vtools/dialogs/tools/dialogseamallowance.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp index 9e71a3a27..5f767e6af 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp @@ -376,7 +376,7 @@ void DialogPiecePath::EvalWidth() labelEditFormula = ui->labelEditWidth; const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString formula = ui->plainTextEditFormulaWidth->toPlainText(); - m_saWidth = Eval(formula, flagFormula, ui->labelResultWidth, postfix, true, true); + m_saWidth = Eval(formula, flagFormula, ui->labelResultWidth, postfix, false, true); if (m_saWidth >= 0) { @@ -397,7 +397,7 @@ void DialogPiecePath::EvalWidthBefore() const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText(); bool flagFormula = false; // fake flag - Eval(formula, flagFormula, ui->labelResultBefore, postfix, true, true); + Eval(formula, flagFormula, ui->labelResultBefore, postfix, false, true); UpdateNodeSABefore(GetFormulaSAWidthBefore()); } @@ -409,7 +409,7 @@ void DialogPiecePath::EvalWidthAfter() const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText(); bool flagFormula = false; // fake flag - Eval(formula, flagFormula, ui->labelResultAfter, postfix, true, true); + Eval(formula, flagFormula, ui->labelResultAfter, postfix, false, true); UpdateNodeSABefore(GetFormulaSAWidthAfter()); } diff --git a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp index e2f9c1d74..5b6abae29 100644 --- a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp @@ -1081,7 +1081,7 @@ void DialogSeamAllowance::EvalWidth() labelEditFormula = ui->labelEditWidth; const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString formula = ui->plainTextEditFormulaWidth->toPlainText(); - m_saWidth = Eval(formula, flagFormula, ui->labelResultWidth, postfix, true, true); + m_saWidth = Eval(formula, flagFormula, ui->labelResultWidth, postfix, false, true); if (m_saWidth >= 0) { @@ -1102,7 +1102,7 @@ void DialogSeamAllowance::EvalWidthBefore() const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText(); bool flagFormula = false; // fake flag - Eval(formula, flagFormula, ui->labelResultBefore, postfix, true, true); + Eval(formula, flagFormula, ui->labelResultBefore, postfix, false, true); UpdateNodeSABefore(GetFormulaSAWidthBefore()); } @@ -1114,7 +1114,7 @@ void DialogSeamAllowance::EvalWidthAfter() const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText(); bool flagFormula = false; // fake flag - Eval(formula, flagFormula, ui->labelResultAfter, postfix, true, true); + Eval(formula, flagFormula, ui->labelResultAfter, postfix, false, true); UpdateNodeSAAfter(GetFormulaSAWidthAfter()); }