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

Refactoring.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-03-26 17:47:27 +02:00
parent 335d4e2b81
commit 6b6d124cbb
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,9 +53,15 @@ QT_WARNING_POP
//---------------------------------------------------------------------------------------------------------------------
VBank::VBank()
:details(QVector<VLayoutPiece>()), unsorted(QHash<int, qint64>()), big(QHash<int, qint64>()),
middle(QHash<int, qint64>()), small(QHash<int, qint64>()), layoutWidth(0), caseType(Cases::CaseDesc),
prepare(false), diagonal(0)
: details(),
unsorted(),
big(),
middle(),
small(),
layoutWidth(0),
caseType(Cases::CaseDesc),
prepare(false),
diagonal(0)
{}
//---------------------------------------------------------------------------------------------------------------------
@ -65,7 +71,7 @@ qreal VBank::GetLayoutWidth() const
}
//---------------------------------------------------------------------------------------------------------------------
void VBank::SetLayoutWidth(const qreal &value)
void VBank::SetLayoutWidth(qreal value)
{
layoutWidth = value;
Reset();
@ -79,14 +85,14 @@ void VBank::SetDetails(const QVector<VLayoutPiece> &details)
}
//---------------------------------------------------------------------------------------------------------------------
int VBank::GetTiket()
int VBank::GetNext()
{
if (prepare == false)
{
return -1;
}
if (LeftArrange() == 0)
if (LeftToArrange() == 0)
{
if (unsorted.isEmpty())
{
@ -245,7 +251,7 @@ int VBank::AllDetailsCount() const
}
//---------------------------------------------------------------------------------------------------------------------
int VBank::LeftArrange() const
int VBank::LeftToArrange() const
{
return big.count() + middle.count() + small.count();
}

6
src/libs/vlayout/vbank.h
View File

@ -52,10 +52,10 @@ public:
VBank();
qreal GetLayoutWidth() const;
void SetLayoutWidth(const qreal &value);
void SetLayoutWidth(qreal value);
void SetDetails(const QVector<VLayoutPiece> &details);
int GetTiket();
int GetNext();
VLayoutPiece GetDetail(int i) const;
void Arranged(int i);
@ -66,7 +66,7 @@ public:
void SetCaseType(Cases caseType);
int AllDetailsCount() const;
int LeftArrange() const;
int LeftToArrange() const;
int ArrangedCount() const;
qreal GetBiggestDiagonal() const;

4
src/libs/vlayout/vlayoutgenerator.cpp
View File

@ -151,7 +151,7 @@ void VLayoutGenerator::Generate()
paper.SetSaveLength(saveLength);
do
{
const int index = bank->GetTiket();
const int index = bank->GetNext();
if (paper.ArrangeDetail(bank->GetDetail(index), stopGeneration))
{
bank->Arranged(index);
@ -166,7 +166,7 @@ void VLayoutGenerator::Generate()
{
break;
}
} while(bank->LeftArrange() > 0);
} while(bank->LeftToArrange() > 0);
if (stopGeneration.load())
{