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

Fixed issue #913. Unable to save changes for piece path if it doesn't contain a

Browse Source 
point.

--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2018-12-20 17:54:54 +02:00
parent c60bcc30ac
commit b36e4e2cf8
3 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -3,6 +3,7 @@
- [#905] Valentina crashes with error: This id is not unique. - [#905] Valentina crashes with error: This id is not unique.
- [#909] Valentina produces wrong united path. - [#909] Valentina produces wrong united path.
- [#912] Labels in inactive state return to initial color. - [#912] Labels in inactive state return to initial color.
- [#913] Unable to save changes for piece path if it doesn't contain a point.
# Version 0.6.1 October 23, 2018 # Version 0.6.1 October 23, 2018
- [#885] Regression. Broken support for multi size measurements. - [#885] Regression. Broken support for multi size measurements.

54
src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
View File

@ -748,34 +748,52 @@ void DialogPiecePath::EvalWidth()
void DialogPiecePath::EvalWidthBefore() void DialogPiecePath::EvalWidthBefore()
{ {
labelEditFormula = ui->labelEditBefore; labelEditFormula = ui->labelEditBefore;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); if (ui->comboBoxNodes->count() > 0)
QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText();
Eval(formula, m_flagFormulaBefore, ui->labelResultBefore, postfix, false, true);
formula = GetFormulaSAWidthBefore();
if (formula != currentSeamAllowance)
{ {
ui->pushButtonDefBefore->setEnabled(true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
} QString formula = ui->plainTextEditFormulaWidthBefore->toPlainText();
Eval(formula, m_flagFormulaBefore, ui->labelResultBefore, postfix, false, true);
UpdateNodeSABefore(formula); formula = GetFormulaSAWidthBefore();
if (formula != currentSeamAllowance)
{
ui->pushButtonDefBefore->setEnabled(true);
}
UpdateNodeSABefore(formula);
}
else
{
ChangeColor(labelEditFormula, okColor);
ui->labelResultBefore->setText(tr("<Empty>"));
m_flagFormulaBefore = true;
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogPiecePath::EvalWidthAfter() void DialogPiecePath::EvalWidthAfter()
{ {
labelEditFormula = ui->labelEditAfter; labelEditFormula = ui->labelEditAfter;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); if (ui->comboBoxNodes->count() > 0)
QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText();
Eval(formula, m_flagFormulaAfter, ui->labelResultAfter, postfix, false, true);
formula = GetFormulaSAWidthAfter();
if (formula != currentSeamAllowance)
{ {
ui->pushButtonDefAfter->setEnabled(true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
} QString formula = ui->plainTextEditFormulaWidthAfter->toPlainText();
Eval(formula, m_flagFormulaAfter, ui->labelResultAfter, postfix, false, true);
UpdateNodeSAAfter(formula); formula = GetFormulaSAWidthAfter();
if (formula != currentSeamAllowance)
{
ui->pushButtonDefAfter->setEnabled(true);
}
UpdateNodeSAAfter(formula);
}
else
{
ChangeColor(labelEditFormula, okColor);
ui->labelResultAfter->setText(tr("<Empty>"));
m_flagFormulaAfter = true;
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

42
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -2079,13 +2079,22 @@ void DialogSeamAllowance::EvalWidthBefore()
if (uiTabPaths->checkBoxSeams->isChecked()) if (uiTabPaths->checkBoxSeams->isChecked())
{ {
labelEditFormula = uiTabPaths->labelEditBefore; labelEditFormula = uiTabPaths->labelEditBefore;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); if (uiTabPaths->comboBoxNodes->count() > 0)
const QString formula = uiTabPaths->plainTextEditFormulaWidthBefore->toPlainText(); {
Eval(formula, flagFormulaBefore, uiTabPaths->labelResultBefore, postfix, false, true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
const QString formula = uiTabPaths->plainTextEditFormulaWidthBefore->toPlainText();
Eval(formula, flagFormulaBefore, uiTabPaths->labelResultBefore, postfix, false, true);
const QString formulaSABefore = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthBefore); const QString formulaSABefore = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthBefore);
UpdateNodeSABefore(formulaSABefore); UpdateNodeSABefore(formulaSABefore);
EnableDefButton(uiTabPaths->pushButtonDefBefore, formulaSABefore); EnableDefButton(uiTabPaths->pushButtonDefBefore, formulaSABefore);
}
else
{
ChangeColor(labelEditFormula, okColor);
uiTabPaths->labelResultBefore->setText(tr("<Empty>"));
flagFormulaBefore = true;
}
} }
} }
@ -2095,13 +2104,22 @@ void DialogSeamAllowance::EvalWidthAfter()
if (uiTabPaths->checkBoxSeams->isChecked()) if (uiTabPaths->checkBoxSeams->isChecked())
{ {
labelEditFormula = uiTabPaths->labelEditAfter; labelEditFormula = uiTabPaths->labelEditAfter;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); if (uiTabPaths->comboBoxNodes->count() > 0)
const QString formula = uiTabPaths->plainTextEditFormulaWidthAfter->toPlainText(); {
Eval(formula, flagFormulaAfter, uiTabPaths->labelResultAfter, postfix, false, true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
const QString formula = uiTabPaths->plainTextEditFormulaWidthAfter->toPlainText();
Eval(formula, flagFormulaAfter, uiTabPaths->labelResultAfter, postfix, false, true);
const QString formulaSAAfter = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthAfter); const QString formulaSAAfter = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthAfter);
UpdateNodeSAAfter(formulaSAAfter); UpdateNodeSAAfter(formulaSAAfter);
EnableDefButton(uiTabPaths->pushButtonDefAfter, formulaSAAfter); EnableDefButton(uiTabPaths->pushButtonDefAfter, formulaSAAfter);
}
else
{
ChangeColor(labelEditFormula, okColor);
uiTabPaths->labelResultAfter->setText(tr("<Empty>"));
flagFormulaAfter = true;
}
} }
} }