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

A seam allowance value can be 0.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-01-25 14:20:25 +02:00
parent d7d9deb536
commit 19400f5b83
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,7 @@ void DialogPiecePath::EvalWidth()
labelEditFormula = ui->labelEditWidth; labelEditFormula = ui->labelEditWidth;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidth->toPlainText(); 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) if (m_saWidth >= 0)
{ {
@ -397,7 +397,7 @@ void DialogPiecePath::EvalWidthBefore()
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText(); const QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText();
bool flagFormula = false; // fake flag bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultBefore, postfix, true, true); Eval(formula, flagFormula, ui->labelResultBefore, postfix, false, true);
UpdateNodeSABefore(GetFormulaSAWidthBefore()); UpdateNodeSABefore(GetFormulaSAWidthBefore());
} }
@ -409,7 +409,7 @@ void DialogPiecePath::EvalWidthAfter()
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText(); const QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText();
bool flagFormula = false; // fake flag bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultAfter, postfix, true, true); Eval(formula, flagFormula, ui->labelResultAfter, postfix, false, true);
UpdateNodeSABefore(GetFormulaSAWidthAfter()); UpdateNodeSABefore(GetFormulaSAWidthAfter());
} }

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

@ -1081,7 +1081,7 @@ void DialogSeamAllowance::EvalWidth()
labelEditFormula = ui->labelEditWidth; labelEditFormula = ui->labelEditWidth;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidth->toPlainText(); 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) if (m_saWidth >= 0)
{ {
@ -1102,7 +1102,7 @@ void DialogSeamAllowance::EvalWidthBefore()
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText(); const QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText();
bool flagFormula = false; // fake flag bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultBefore, postfix, true, true); Eval(formula, flagFormula, ui->labelResultBefore, postfix, false, true);
UpdateNodeSABefore(GetFormulaSAWidthBefore()); UpdateNodeSABefore(GetFormulaSAWidthBefore());
} }
@ -1114,7 +1114,7 @@ void DialogSeamAllowance::EvalWidthAfter()
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText(); const QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText();
bool flagFormula = false; // fake flag bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultAfter, postfix, true, true); Eval(formula, flagFormula, ui->labelResultAfter, postfix, false, true);
UpdateNodeSAAfter(GetFormulaSAWidthAfter()); UpdateNodeSAAfter(GetFormulaSAWidthAfter());
} }