Fixed bug in dialog Internal Piece Path.

Value from the field After rewrited data in the field Before.
(grafted from bf1336d102f09e2efef6afe4db87a0692df44b86)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-05-26 19:27:11 +03:00
parent 4d262cba26
commit f9060f1bb7
2 changed files with 7 additions and 4 deletions

View File

@ -10,6 +10,7 @@
- [#689] Grainline default values swapped around.
- [#688] Difficult to enter numbers in Tape.
- Fixed bug in Tape app. Tape showed birth date in wrong locale.
- Fixed bug in dialog Internal Piece Path. Value from the field After rewrited data in the field Before.
# Version 0.5.0 May 9, 2017
- [#581] User can now filter input lists by keyword in function wizard.

View File

@ -575,16 +575,17 @@ void DialogPiecePath::EvalWidthBefore()
{
labelEditFormula = ui->labelEditBefore;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText();
QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText();
bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultBefore, postfix, false, true);
formula = GetFormulaSAWidthBefore();
if (formula != currentSeamAllowance)
{
ui->pushButtonDefBefore->setEnabled(true);
}
UpdateNodeSABefore(GetFormulaSAWidthBefore());
UpdateNodeSABefore(formula);
}
//---------------------------------------------------------------------------------------------------------------------
@ -592,16 +593,17 @@ void DialogPiecePath::EvalWidthAfter()
{
labelEditFormula = ui->labelEditAfter;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText();
QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText();
bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultAfter, postfix, false, true);
formula = GetFormulaSAWidthAfter();
if (formula != currentSeamAllowance)
{
ui->pushButtonDefAfter->setEnabled(true);
}
UpdateNodeSABefore(GetFormulaSAWidthAfter());
UpdateNodeSAAfter(formula);
}
//---------------------------------------------------------------------------------------------------------------------