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

Fix bug in dialog Seam allowance tool.

Browse Source 
The dialog should prevent user to save a detail with broken formula.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-11-01 11:40:19 +02:00
parent d1e3531247
commit b453d2b2d6
2 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,9 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
flagDLFormulas(true), flagDLFormulas(true),
flagPLAngle(true), flagPLAngle(true),
flagPLFormulas(true), flagPLFormulas(true),
flagFormulaBefore(true),
flagFormulaAfter(true),
flagMainPathIsValid(true),
m_bAddMode(true), m_bAddMode(true),
m_mx(0), m_mx(0),
m_my(0), m_my(0),
@ -151,7 +154,7 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
flagName = true;//We have default name of piece. flagName = true;//We have default name of piece.
ChangeColor(uiTabLabels->labelEditName, okColor); ChangeColor(uiTabLabels->labelEditName, okColor);
flagError = MainPathIsValid(); flagMainPathIsValid = MainPathIsValid();
CheckState(); CheckState();
if (not applyAllowed) if (not applyAllowed)
@ -465,13 +468,56 @@ void DialogSeamAllowance::SaveData()
void DialogSeamAllowance::CheckState() void DialogSeamAllowance::CheckState()
{ {
SCASSERT(bOk != nullptr); SCASSERT(bOk != nullptr);
bOk->setEnabled(flagName && flagError && flagFormula && (flagGFormulas || flagGPin) bOk->setEnabled(flagName && flagMainPathIsValid && flagFormula && flagFormulaBefore && flagFormulaAfter
&& flagDLAngle && (flagDLFormulas || flagDPin) && flagPLAngle && (flagPLFormulas || flagPPin)); && (flagGFormulas || flagGPin) && flagDLAngle && (flagDLFormulas || flagDPin) && flagPLAngle
&& (flagPLFormulas || flagPPin));
// In case dialog hasn't apply button // In case dialog hasn't apply button
if ( bApply != nullptr && applyAllowed) if ( bApply != nullptr && applyAllowed)
{ {
bApply->setEnabled(bOk->isEnabled()); bApply->setEnabled(bOk->isEnabled());
} }
if (flagFormula && flagFormulaBefore && flagFormulaAfter)
{
if (flagMainPathIsValid)
{
m_ftb->SetTabText(TabOrder::Paths, tr("Paths"));
}
uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabSeamAllowance), QIcon());
}
else
{
m_ftb->SetTabText(TabOrder::Paths, tr("Paths") + QLatin1String("*"));
const QIcon icon = QIcon::fromTheme("dialog-warning",
QIcon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"));
uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabSeamAllowance), icon);
}
if (flagMainPathIsValid)
{
if (flagFormula && flagFormulaBefore && flagFormulaAfter)
{
m_ftb->SetTabText(TabOrder::Paths, tr("Paths"));
}
QString tooltip = tr("Ready!");
if (not applyAllowed)
{
tooltip = tooltip + QLatin1String(" <b>") +
tr("To open all detail's features complete creating the main path.") + QLatin1String("</b>");
}
uiTabPaths->helpLabel->setText(tooltip);
uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabMainPath), QIcon());
}
else
{
m_ftb->SetTabText(TabOrder::Paths, tr("Paths") + QLatin1String("*"));
const QIcon icon = QIcon::fromTheme("dialog-warning",
QIcon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"));
uiTabPaths->tabWidget->setTabIcon(uiTabPaths->tabWidget->indexOf(uiTabPaths->tabMainPath), icon);
}
uiTabPaths->comboBoxNodes->setEnabled(flagFormulaBefore && flagFormulaAfter);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -1995,8 +2041,7 @@ void DialogSeamAllowance::EvalWidthBefore()
labelEditFormula = uiTabPaths->labelEditBefore; labelEditFormula = uiTabPaths->labelEditBefore;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
const QString formula = uiTabPaths->plainTextEditFormulaWidthBefore->toPlainText(); const QString formula = uiTabPaths->plainTextEditFormulaWidthBefore->toPlainText();
bool flagFormula = false; // fake flag Eval(formula, flagFormulaBefore, uiTabPaths->labelResultBefore, postfix, false, true);
Eval(formula, flagFormula, uiTabPaths->labelResultBefore, postfix, false, true);
const QString formulaSABefore = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthBefore); const QString formulaSABefore = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthBefore);
UpdateNodeSABefore(formulaSABefore); UpdateNodeSABefore(formulaSABefore);
@ -2009,8 +2054,7 @@ void DialogSeamAllowance::EvalWidthAfter()
labelEditFormula = uiTabPaths->labelEditAfter; labelEditFormula = uiTabPaths->labelEditAfter;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
const QString formula = uiTabPaths->plainTextEditFormulaWidthAfter->toPlainText(); const QString formula = uiTabPaths->plainTextEditFormulaWidthAfter->toPlainText();
bool flagFormula = false; // fake flag Eval(formula, flagFormulaAfter, uiTabPaths->labelResultAfter, postfix, false, true);
Eval(formula, flagFormula, uiTabPaths->labelResultAfter, postfix, false, true);
const QString formulaSAAfter = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthAfter); const QString formulaSAAfter = GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthAfter);
UpdateNodeSAAfter(formulaSAAfter); UpdateNodeSAAfter(formulaSAAfter);
@ -2077,8 +2121,7 @@ void DialogSeamAllowance::WidthBeforeChanged()
labelEditFormula = uiTabPaths->labelEditBefore; labelEditFormula = uiTabPaths->labelEditBefore;
labelResultCalculation = uiTabPaths->labelResultBefore; labelResultCalculation = uiTabPaths->labelResultBefore;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
bool flagFormula = false; ValFormulaChanged(flagFormulaBefore, uiTabPaths->plainTextEditFormulaWidthBefore, m_timerWidthBefore, postfix);
ValFormulaChanged(flagFormula, uiTabPaths->plainTextEditFormulaWidthBefore, m_timerWidthBefore, postfix);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -2087,8 +2130,7 @@ void DialogSeamAllowance::WidthAfterChanged()
labelEditFormula = uiTabPaths->labelEditAfter; labelEditFormula = uiTabPaths->labelEditAfter;
labelResultCalculation = uiTabPaths->labelResultAfter; labelResultCalculation = uiTabPaths->labelResultAfter;
const QString postfix = UnitsToStr(qApp->patternUnit(), true); const QString postfix = UnitsToStr(qApp->patternUnit(), true);
bool flagFormula = false; ValFormulaChanged(flagFormulaAfter, uiTabPaths->plainTextEditFormulaWidthAfter, m_timerWidthAfter, postfix);
ValFormulaChanged(flagFormula, uiTabPaths->plainTextEditFormulaWidthAfter, m_timerWidthAfter, postfix);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -2340,29 +2382,13 @@ bool DialogSeamAllowance::MainPathIsValid() const
} }
} }
if (valid)
{
m_ftb->SetTabText(TabOrder::Paths, tr("Paths"));
QString tooltip = tr("Ready!");
if (not applyAllowed)
{
tooltip = tooltip + QLatin1String(" <b>") +
tr("To open all detail's features complete creating the main path.") + QLatin1String("</b>");
}
uiTabPaths->helpLabel->setText(tooltip);
}
else
{
m_ftb->SetTabText(TabOrder::Paths, tr("Paths") + QLatin1String("*"));
}
return valid; return valid;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::ValidObjects(bool value) void DialogSeamAllowance::ValidObjects(bool value)
{ {
flagError = value; flagMainPathIsValid = value;
CheckState(); CheckState();
} }

3
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
View File

@ -184,6 +184,9 @@ private:
bool flagDLFormulas; bool flagDLFormulas;
bool flagPLAngle; bool flagPLAngle;
bool flagPLFormulas; bool flagPLFormulas;
bool flagFormulaBefore;
bool flagFormulaAfter;
bool flagMainPathIsValid;
bool m_bAddMode; bool m_bAddMode;
qreal m_mx; qreal m_mx;
qreal m_my; qreal m_my;