palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-30 04:11:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix strip optimization. It must follow paper sheet orientation settings.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-01-02 16:49:57 +02:00
parent d5d8104d3a
commit 25fc7227f0
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libs/vlayout/vlayoutgenerator.cpp
View file

@ -115,18 +115,23 @@ void VLayoutGenerator::Generate()
if (bank->Prepare())
{
const int width = PageWidth();
int width = PageWidth();
int height = PageHeight();
if (stripOptimization)
{
const qreal b = bank->GetBiggestDiagonal() * multiplier + bank->GetLayoutWidth();
if (height >= b*2)
auto SetStrip = [this, b](int &side)
{
if (side >= b*2)
{
stripOptimizationEnabled = true;
height = qFloor(height / qFloor(height/b));
side = qFloor(side / qFloor(side/b));
}
};
IsPortrait() ? SetStrip(height) : SetStrip(width);
}
while (bank->AllDetailsCount() > 0)
@ -306,6 +311,12 @@ int VLayoutGenerator::PageWidth() const
return static_cast<int>(paperWidth - (margins.left() + margins.right()));
}
//---------------------------------------------------------------------------------------------------------------------
bool VLayoutGenerator::IsPortrait() const
{
return PageHeight() >= PageWidth();
}
//---------------------------------------------------------------------------------------------------------------------
void VLayoutGenerator::GatherPages()
{

1
src/libs/vlayout/vlayoutgenerator.h
View file

@ -147,6 +147,7 @@ private:
int PageHeight() const;
int PageWidth() const;
bool IsPortrait() const;
void GatherPages();
void UnitePages();