Control length of a passmark for builtin seam allowance with global setting. #124
This case was not covered.
(cherry picked from commit a5191ce763
)
This commit is contained in:
parent
81ed01e281
commit
d7041cc835
|
@ -831,12 +831,20 @@ QVector<QLineF> VPassmark::BuiltInSAPassmarkBaseLine(const VPiece &piece) const
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2' with built in "
|
if (m_data.globalPassmarkLength > accuracyPointOnLine)
|
||||||
"seam allowance. User must manually provide length.")
|
{
|
||||||
|
length = m_data.globalPassmarkLength;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2' with built "
|
||||||
|
"in seam allowance. User must manually provide length.")
|
||||||
.arg(m_data.nodeName, m_data.pieceName);
|
.arg(m_data.nodeName, m_data.pieceName);
|
||||||
VAbstractApplication::VApp()->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
|
VAbstractApplication::VApp()->IsPedantic()
|
||||||
qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;
|
? throw VExceptionInvalidNotch(errorMsg)
|
||||||
return QVector<QLineF>();
|
: qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;
|
||||||
|
return {};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user