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

Fix calculating efficiency.

Browse Source 
Piece square must be based on seam allowance or main path instead of layout
allowance.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-07-18 17:32:19 +03:00
parent c9d68f9ea6
commit 0d7c406df4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/vlayout/vlayoutpiece.cpp
View File

@ -915,22 +915,29 @@ qint64 VLayoutPiece::Square() const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VLayoutPiece::SetLayoutAllowancePoints() void VLayoutPiece::SetLayoutAllowancePoints()
{ {
d->m_square = 0;
if (d->layoutWidth > 0) if (d->layoutWidth > 0)
{ {
if (IsSeamAllowance() && not IsSeamAllowanceBuiltIn()) if (IsSeamAllowance() && not IsSeamAllowanceBuiltIn())
{ {
d->layoutAllowance = Equidistant(PrepareAllowance(GetMappedSeamAllowancePoints()), d->layoutWidth, GetName()); d->layoutAllowance = Equidistant(PrepareAllowance(GetMappedSeamAllowancePoints()), d->layoutWidth,
if (d->layoutAllowance.isEmpty() == false) GetName());
if (not d->layoutAllowance.isEmpty())
{ {
d->layoutAllowance.removeLast(); d->layoutAllowance.removeLast();
d->m_square = qFloor(qAbs(SumTrapezoids(GetSeamAllowancePoints())/2.0));
} }
} }
else else
{ {
d->layoutAllowance = Equidistant(PrepareAllowance(GetMappedContourPoints()), d->layoutWidth, GetName()); d->layoutAllowance = Equidistant(PrepareAllowance(GetMappedContourPoints()), d->layoutWidth, GetName());
if (d->layoutAllowance.isEmpty() == false) if (not d->layoutAllowance.isEmpty())
{ {
d->layoutAllowance.removeLast(); d->layoutAllowance.removeLast();
d->m_square = qFloor(qAbs(SumTrapezoids(GetContourPoints())/2.0));
} }
} }
} }
@ -938,13 +945,6 @@ void VLayoutPiece::SetLayoutAllowancePoints()
{ {
d->layoutAllowance.clear(); d->layoutAllowance.clear();
} }
if (d->layoutAllowance.isEmpty()) //-V807
{
d->m_square = 0;
}
d->m_square = qFloor(qAbs(SumTrapezoids(d->layoutAllowance)/2.0));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------