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

Fix check layout allowance size position. ref #782.

Browse Source 
We generate layout allowance right just before creating layout. Because before
this we don't know all options.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-12-12 10:23:46 +02:00
parent 850bb88c6b
commit 8b4fc33649
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/valentina/mainwindowsnogui.cpp
View File

@ -742,13 +742,7 @@ QVector<VLayoutPiece> MainWindowsNoGUI::PrepareDetailsForLayout(const QHash<quin
{ {
VAbstractTool *tool = qobject_cast<VAbstractTool*>(VAbstractPattern::getTool(i.key())); VAbstractTool *tool = qobject_cast<VAbstractTool*>(VAbstractPattern::getTool(i.key()));
SCASSERT(tool != nullptr) SCASSERT(tool != nullptr)
const VLayoutPiece piece = VLayoutPiece::Create(i.value(), tool->getData()); listDetails.append(VLayoutPiece::Create(i.value(), tool->getData()));
if (not piece.IsLayoutAllowanceValid())
{
qWarning()<< tr("Piece '%1' may broke a layout. Please, check seam allowance to check how seam "
"allowance behave.").arg(piece.GetName());
}
listDetails.append(piece);
++i; ++i;
} }
} }

5
src/libs/vlayout/vbank.cpp
View File

@ -190,6 +190,11 @@ bool VBank::Prepare()
{ {
details[i].SetLayoutWidth(layoutWidth); details[i].SetLayoutWidth(layoutWidth);
details[i].SetLayoutAllowancePoints(); details[i].SetLayoutAllowancePoints();
if (not details[i].IsLayoutAllowanceValid())
{
qWarning()<< QObject::tr("Piece '%1' may broke a layout. Please, check seam allowance to check how seam "
"allowance behave.").arg(details[i].GetName());
}
const qreal d = details.at(i).Diagonal(); const qreal d = details.at(i).Diagonal();
if (d > diagonal) if (d > diagonal)