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

Return -1 if was used global seam allowance width instead of calculating its

Browse Source 
value.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-03-30 11:09:12 +03:00
parent e2db513172
commit d3ab7f5b16
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/vpatterndb/vpiecenode.cpp
View File

@ -154,12 +154,22 @@ void VPieceNode::SetReverse(bool reverse)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal VPieceNode::GetSABefore(const VContainer *data) const qreal VPieceNode::GetSABefore(const VContainer *data) const
{ {
if (d->m_formulaWidthBefore == currentSeamAllowance)
{
return -1;
}
return EvalFormula(data, d->m_formulaWidthBefore); return EvalFormula(data, d->m_formulaWidthBefore);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal VPieceNode::GetSABefore(const VContainer *data, Unit unit) const qreal VPieceNode::GetSABefore(const VContainer *data, Unit unit) const
{ {
if (d->m_formulaWidthBefore == currentSeamAllowance)
{
return -1;
}
qreal value = EvalFormula(data, d->m_formulaWidthBefore); qreal value = EvalFormula(data, d->m_formulaWidthBefore);
if (value >= 0) if (value >= 0)
{ {
@ -186,12 +196,22 @@ void VPieceNode::SetFormulaSABefore(const QString &formula)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal VPieceNode::GetSAAfter(const VContainer *data) const qreal VPieceNode::GetSAAfter(const VContainer *data) const
{ {
if (d->m_formulaWidthAfter == currentSeamAllowance)
{
return -1;
}
return EvalFormula(data, d->m_formulaWidthAfter); return EvalFormula(data, d->m_formulaWidthAfter);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal VPieceNode::GetSAAfter(const VContainer *data, Unit unit) const qreal VPieceNode::GetSAAfter(const VContainer *data, Unit unit) const
{ {
if (d->m_formulaWidthAfter == currentSeamAllowance)
{
return -1;
}
qreal value = EvalFormula(data, d->m_formulaWidthAfter); qreal value = EvalFormula(data, d->m_formulaWidthAfter);
if (value >= 0) if (value >= 0)
{ {