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

Refactoring VPiecePath::StartSegment and VPiecePath::EndSegment.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-12-01 20:44:29 +02:00
parent 5ab4169fa2
commit 7b3c05dfa8
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/libs/vpatterndb/vpiecepath.cpp
View File

@ -250,7 +250,7 @@ QPainterPath VPiecePath::PainterPath(const VContainer *data) const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VSAPoint VPiecePath::StartSegment(const VContainer *data, const QVector<VPieceNode> &nodes, int i, bool reverse) VSAPoint VPiecePath::StartSegment(const VContainer *data, const QVector<VPieceNode> &nodes, int i, bool reverse)
{ {
if (i < 0 && i > nodes.size()-1) if (i < 0 || i > nodes.size()-1)
{ {
return VSAPoint(); return VSAPoint();
} }
@ -266,36 +266,10 @@ VSAPoint VPiecePath::StartSegment(const VContainer *data, const QVector<VPieceNo
VSAPoint begin = VSAPoint(points.first()); VSAPoint begin = VSAPoint(points.first());
if (nodes.size() > 1) if (nodes.size() > 1)
{ {
if (i == 0) int index = 0;
{ i == 0 ? index = nodes.size()-1 : index = i-1;
if (nodes.at(nodes.size()-1).GetTypeTool() == Tool::NodePoint)
{ begin = CurvePoint(begin, data, nodes.at(index), curve);
const VPieceNode &node = nodes.at(nodes.size()-1);
const QPointF p = *data->GeometricObject<VPointF>(node.GetId());
if (curve->IsPointOnCurve(p))
{
begin = VSAPoint(p);
begin.SetSAAfter(node.GetSAAfter(*data->GetPatternUnit()));
begin.SetSABefore(node.GetSABefore(*data->GetPatternUnit()));
begin.SetAngleType(node.GetAngleType());
}
}
}
else
{
if (nodes.at(i-1).GetTypeTool() == Tool::NodePoint)
{
const VPieceNode &node = nodes.at(i-1);
const QPointF p = *data->GeometricObject<VPointF>(node.GetId());
if (curve->IsPointOnCurve(p))
{
begin = VSAPoint(p);
begin.SetSAAfter(node.GetSAAfter(*data->GetPatternUnit()));
begin.SetSABefore(node.GetSABefore(*data->GetPatternUnit()));
begin.SetAngleType(node.GetAngleType());
}
}
}
} }
return begin; return begin;
} }
@ -303,7 +277,7 @@ VSAPoint VPiecePath::StartSegment(const VContainer *data, const QVector<VPieceNo
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VSAPoint VPiecePath::EndSegment(const VContainer *data, const QVector<VPieceNode> &nodes, int i, bool reverse) VSAPoint VPiecePath::EndSegment(const VContainer *data, const QVector<VPieceNode> &nodes, int i, bool reverse)
{ {
if (i < 0 && i > nodes.size()-1) if (i < 0 || i > nodes.size()-1)
{ {
return VSAPoint(); return VSAPoint();
} }
@ -513,3 +487,22 @@ QVector<VSAPoint> VPiecePath::CurveSeamAllowanceSegment(const VContainer *data,
return pointsEkv; return pointsEkv;
} }
//---------------------------------------------------------------------------------------------------------------------
VSAPoint VPiecePath::CurvePoint(const VSAPoint &candidate, const VContainer *data, const VPieceNode &node,
const QSharedPointer<VAbstractCurve> &curve)
{
VSAPoint point = candidate;
if (node.GetTypeTool() == Tool::NodePoint)
{
const QPointF p = *data->GeometricObject<VPointF>(node.GetId());
if (curve->IsPointOnCurve(p))
{
point = VSAPoint(p);
point.SetSAAfter(node.GetSAAfter(*data->GetPatternUnit()));
point.SetSABefore(node.GetSABefore(*data->GetPatternUnit()));
point.SetAngleType(node.GetAngleType());
}
}
return point;
}

3
src/libs/vpatterndb/vpiecepath.h
View File

@ -92,6 +92,9 @@ public:
private: private:
QSharedDataPointer<VPiecePathData> d; QSharedDataPointer<VPiecePathData> d;
static VSAPoint CurvePoint(const VSAPoint &candidate, const VContainer *data, const VPieceNode &node,
const QSharedPointer<VAbstractCurve> &curve);
}; };
Q_DECLARE_TYPEINFO(VPiecePath, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(VPiecePath, Q_MOVABLE_TYPE);