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

Also check shift for each edge.

Browse Source 
--HG--
branch : feature
This commit is contained in:
dismine 2015-01-12 17:23:25 +02:00
parent 98d5dde2e1
commit 8dec59ef00
5 changed files with 223 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@
//---------------------------------------------------------------------------------------------------------------------
VLayoutGenerator::VLayoutGenerator(QObject *parent)
:QObject(parent), papers(QVector<VLayoutPaper>()), bank(new VBank()), paperHeight(0), paperWidth(0),
stopGeneration(false), state(LayoutErrors::NoError)
stopGeneration(false), state(LayoutErrors::NoError), shift(0)
{}
//---------------------------------------------------------------------------------------------------------------------
@ -88,6 +88,7 @@ void VLayoutGenerator::Generate()
}
VLayoutPaper paper(paperHeight, paperWidth);
paper.SetShift(shift);
if (bank->LeftArrange() > 0)
{
const int index = bank->GetTiket();
@ -160,6 +161,18 @@ void VLayoutGenerator::SetPaperWidth(int value)
paperWidth = value;
}
//---------------------------------------------------------------------------------------------------------------------
unsigned int VLayoutGenerator::GetShift() const
{
return shift;
}
//---------------------------------------------------------------------------------------------------------------------
void VLayoutGenerator::SetShift(unsigned int shift)
{
this->shift = shift;
}
//---------------------------------------------------------------------------------------------------------------------
int VLayoutGenerator::GetPaperHeight() const
{
@ -171,4 +184,3 @@ void VLayoutGenerator::SetPaperHeight(int value)
{
paperHeight = value;
}

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

@ -55,6 +55,9 @@ public:
int GetPaperWidth() const;
void SetPaperWidth(int value);
unsigned int GetShift() const;
void SetShift(unsigned int shift);
void Generate();
LayoutErrors State() const;
@ -76,6 +79,7 @@ private:
int paperWidth;
bool stopGeneration;
LayoutErrors state;
unsigned int shift;
void CheckDetailsSize();
};

186
src/libs/vlayout/vlayoutpaper.cpp
View File

@ -31,6 +31,7 @@
#include <climits>
#include <QPointF>
#include <QtMath>
class BestResult
{
@ -158,6 +159,18 @@ void VLayoutPaper::SetWidth(int width)
d->paperWidth = width;
}
//---------------------------------------------------------------------------------------------------------------------
unsigned int VLayoutPaper::GetShift() const
{
return d->shift;
}
//---------------------------------------------------------------------------------------------------------------------
void VLayoutPaper::SetShift(unsigned int shift)
{
d->shift = shift;
}
//---------------------------------------------------------------------------------------------------------------------
bool VLayoutPaper::ArrangeDetail(const VLayoutDetail &detail)
{
@ -193,18 +206,21 @@ bool VLayoutPaper::AddToBlankSheet(const VLayoutDetail &detail)
{
BestResult bestResult;
for (int j=1; j <= EdgesCount(); ++j)
{
// We should use copy of the detail.
VLayoutDetail workDetail = detail;
for (int i=1; i<= detail.EdgesCount(); i++)
{
int dEdge = i;// For mirror detail edge will be different
if (CheckPosition(workDetail, 1, dEdge))
if (CheckPosition(workDetail, j, dEdge))
{
const QRectF rec = workDetail.BoundingRect();
if (SheetContains(rec))
{
bestResult.NewResult(static_cast<qint64>(rec.width()*rec.height()), 1, dEdge, workDetail.GetMatrix());
bestResult.NewResult(static_cast<qint64>(rec.width()*rec.height()), j, dEdge,
workDetail.GetMatrix());
}
else
{
@ -212,17 +228,9 @@ bool VLayoutPaper::AddToBlankSheet(const VLayoutDetail &detail)
}
}
}
if (bestResult.ValideResult())
{
VLayoutDetail workDetail = detail;
workDetail.SetMatrix(bestResult.Matrix());// Don't forget set matrix
d->details.append(workDetail);
// First detail, just simple take all points
d->globalContour = workDetail.GetLayoutAllowencePoints();
}
return bestResult.ValideResult(); // Do we have the best result?
return SaveResult(bestResult, detail);
}
//---------------------------------------------------------------------------------------------------------------------
@ -256,22 +264,7 @@ bool VLayoutPaper::AddToSheet(const VLayoutDetail &detail)
}
}
if (bestResult.ValideResult())
{
VLayoutDetail workDetail = detail;
workDetail.SetMatrix(bestResult.Matrix());// Don't forget set matrix
const QVector<QPointF> newGContour = UniteWithContour(workDetail, bestResult.GContourEdge(),
bestResult.DetailEdge());
if (newGContour.isEmpty())
{
return false;
}
d->details.append(workDetail);
// First detail, just simple take all points
d->globalContour = newGContour;
}
return bestResult.ValideResult(); // Do we have the best result?
return SaveResult(bestResult, detail);
}
//---------------------------------------------------------------------------------------------------------------------
@ -483,11 +476,29 @@ void VLayoutPaper::CombineEdges(VLayoutDetail &detail, const QLineF &globalEdge,
//---------------------------------------------------------------------------------------------------------------------
QVector<QPointF> VLayoutPaper::UniteWithContour(const VLayoutDetail &detail, int globalI, int detJ) const
{
QVector<QPointF> newContour;
if (d->globalContour.isEmpty())
{
return detail.GetLayoutAllowencePoints();
int processedEdges = 0;
const int nD = detail.EdgesCount();
int j = detJ+1;
do
{
if (j > nD)
{
j=0;
}
const QVector<QPointF> points = CutEdge(detail.Edge(j));
for (int i = 0; i < points.size()-1; ++i)
{
newContour.append(points.at(i));
}
++processedEdges;
++j;
}while (processedEdges < nD);
}
else
{
if (globalI <= 0 || globalI > EdgesCount())
{
return QVector<QPointF>();
@ -498,27 +509,30 @@ QVector<QPointF> VLayoutPaper::UniteWithContour(const VLayoutDetail &detail, int
return QVector<QPointF>();
}
QVector<QPointF> newContour;
for(int i=0; i < d->globalContour.count(); ++i)
{
newContour.append(d->globalContour.at(i));
++i;
if (i==globalI)
{
const QVector<QPointF> dPoints = detail.GetLayoutAllowencePoints();
const int nD = dPoints.count();
int processedPoints = 0;
int j = detJ;
int processedEdges = 0;
const int nD = detail.EdgesCount();
int j = detJ+1;
do
{
if (j > nD-1)
if (j > nD)
{
j=0;
}
newContour.append(dPoints.at(j));
++processedPoints;
const QVector<QPointF> points = CutEdge(detail.Edge(j));
for (int i = 0; i < points.size()-1; ++i)
{
newContour.append(points.at(i));
}
++processedEdges;
++j;
}while (processedPoints<nD);
}while (processedEdges < nD);
}
}
}
return newContour;
@ -530,9 +544,31 @@ QLineF VLayoutPaper::GlobalEdge(int i) const
if (d->details.isEmpty())
{
// Because sheet is blank we have one global edge for all cases - Ox axis.
return QLineF(0, 0, d->paperWidth, 0);
const QLineF axis = QLineF(0, 0, d->paperWidth, 0);
if (d->shift == 0)
{
return axis;
}
const int n = qFloor(axis.length()/d->shift);
if (i < 1 || i > n)
{ // Doesn't exist such edge
return QLineF();
}
if (n <= 0)
{
return axis;
}
else
{
const qreal nShift = axis.length()/n;
return QLineF(nShift*(i-1), 0, nShift*i, 0);
}
}
else
{
if (i < 1 || i > EdgesCount())
{ // Doesn't exist such edge
return QLineF();
@ -548,12 +584,34 @@ QLineF VLayoutPaper::GlobalEdge(int i) const
}
return edge;
}
}
//---------------------------------------------------------------------------------------------------------------------
int VLayoutPaper::EdgesCount() const
{
if (d->details.isEmpty())
{
if (d->shift == 0)
{
return 1;
}
const QLineF axis = QLineF(0, 0, d->paperWidth, 0);
const int n = qFloor(axis.length()/d->shift);
if (n <= 0)
{
return 1;
}
else
{
return n;
}
}
else
{
return d->globalContour.count();
}
}
//---------------------------------------------------------------------------------------------------------------------
QPolygonF VLayoutPaper::GlobalPolygon() const
@ -562,3 +620,53 @@ QPolygonF VLayoutPaper::GlobalPolygon() const
points.append(points.first());
return QPolygonF(points);
}
//---------------------------------------------------------------------------------------------------------------------
QVector<QPointF> VLayoutPaper::CutEdge(const QLineF &edge) const
{
QVector<QPointF> points;
if (d->shift == 0)
{
points.append(edge.p1());
points.append(edge.p2());
}
const int n = qFloor(edge.length()/d->shift);
if (n <= 0)
{
points.append(edge.p1());
points.append(edge.p2());
}
else
{
const qreal nShift = edge.length()/n;
for (int i = 1; i <= n+1; ++i)
{
QLineF l1 = edge;
l1.setLength(nShift*(i-1));
points.append(l1.p2());
}
}
return points;
}
//---------------------------------------------------------------------------------------------------------------------
bool VLayoutPaper::SaveResult(const BestResult &bestResult, const VLayoutDetail &detail)
{
if (bestResult.ValideResult())
{
VLayoutDetail workDetail = detail;
workDetail.SetMatrix(bestResult.Matrix());// Don't forget set matrix
const QVector<QPointF> newGContour = UniteWithContour(workDetail, bestResult.GContourEdge(),
bestResult.DetailEdge());
if (newGContour.isEmpty())
{
return false;
}
d->details.append(workDetail);
d->globalContour = newGContour;
}
return bestResult.ValideResult(); // Do we have the best result?
}

7
src/libs/vlayout/vlayoutpaper.h
View File

@ -36,6 +36,7 @@ class VLayoutDetail;
class QPointF;
class QLineF;
class QPolygonF;
class BestResult;
class VLayoutPaper
{
@ -52,6 +53,9 @@ public:
int GetWidth() const;
void SetWidth(int width);
unsigned int GetShift() const;
void SetShift(unsigned int shift);
bool ArrangeDetail(const VLayoutDetail &detail);
int Count() const;
private:
@ -86,6 +90,9 @@ private:
int EdgesCount() const;
QPolygonF GlobalPolygon() const;
QVector<QPointF> CutEdge(const QLineF &edge) const;
bool SaveResult(const BestResult &bestResult, const VLayoutDetail &detail);
};
#endif // VLAYOUTPAPER_H

9
src/libs/vlayout/vlayoutpaper_p.h
View File

@ -44,16 +44,17 @@ class VLayoutPaperData : public QSharedData
{
public:
VLayoutPaperData()
:details(QVector<VLayoutDetail>()), globalContour(QVector<QPointF>()), paperHeight(0), paperWidth(0)
:details(QVector<VLayoutDetail>()), globalContour(QVector<QPointF>()), paperHeight(0), paperWidth(0), shift(0)
{}
VLayoutPaperData(int height, int width)
:details(QVector<VLayoutDetail>()), globalContour(QVector<QPointF>()), paperHeight(height), paperWidth(width)
:details(QVector<VLayoutDetail>()), globalContour(QVector<QPointF>()), paperHeight(height), paperWidth(width),
shift(0)
{}
VLayoutPaperData(const VLayoutPaperData &paper)
:QSharedData(paper), details(paper.details), globalContour(paper.globalContour), paperHeight(paper.paperHeight),
paperWidth(paper.paperWidth)
paperWidth(paper.paperWidth), shift(paper.shift)
{}
~VLayoutPaperData() {}
@ -69,6 +70,8 @@ public:
/** @brief paperWidth width of paper in pixels*/
int paperWidth;
unsigned int shift;
};
#ifdef Q_CC_GNU