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

Fixed issue #679. Second control point at beginning of curved path - bug.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2017-05-07 08:35:18 +03:00
parent 88f5323152
commit 5f92557609
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -57,6 +57,7 @@
- [#619] Non writable directory prevents opening. - [#619] Non writable directory prevents opening.
- [#620] Detail path not correct. Previous curve also should cut segment. - [#620] Detail path not correct. Previous curve also should cut segment.
- [#157] New feature: Passmarks tool. - [#157] New feature: Passmarks tool.
- [#679] Second control point at beginning of curved path - bug.
# Version 0.4.5 October 15, 2016 # Version 0.4.5 October 15, 2016
- [#435] Valentina doesn't change the cursor. - [#435] Valentina doesn't change the cursor.

57
src/libs/vgeometry/vsplinepoint_p.h
View File

@ -29,11 +29,13 @@
#ifndef VSPLINEPOINT_P_H #ifndef VSPLINEPOINT_P_H
#define VSPLINEPOINT_P_H #define VSPLINEPOINT_P_H
#include <QLineF>
#include <QSharedData> #include <QSharedData>
#include <QtDebug> #include <QtDebug>
#include "vpointf.h" #include "vpointf.h"
#include "../vmisc/def.h" #include "../vmisc/def.h"
#include "../qmuparser/qmutokenparser.h"
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Weffc++")
@ -115,24 +117,7 @@ public:
{} {}
VSplinePointData(VPointF pSpline, qreal angle1, const QString &angle1F, qreal angle2, const QString &angle2F, VSplinePointData(VPointF pSpline, qreal angle1, const QString &angle1F, qreal angle2, const QString &angle2F,
qreal length1, const QString &length1F, qreal length2, const QString &length2F) qreal length1, const QString &length1F, qreal length2, const QString &length2F);
: pSpline(pSpline),
angle1(angle1),
angle1F(angle1F),
angle2(angle2),
angle2F(angle2F),
length1(length1),
length1F(length1F),
length2(length2),
length2F(length2F)
{
if (VFuzzyComparePossibleNulls(angle1, angle2) || not qFuzzyCompare(qAbs(angle1-angle2), 180))
{
qDebug()<<"Make angle1 and angle2 correct.";
this->angle2 = angle1 + 180;
this->angle2F = QString().number(angle2);
}
}
VSplinePointData(const VSplinePointData &point) VSplinePointData(const VSplinePointData &point)
: QSharedData(point), : QSharedData(point),
@ -172,6 +157,42 @@ private:
VSplinePointData &operator=(const VSplinePointData &) Q_DECL_EQ_DELETE; VSplinePointData &operator=(const VSplinePointData &) Q_DECL_EQ_DELETE;
}; };
//---------------------------------------------------------------------------------------------------------------------
VSplinePointData::VSplinePointData(VPointF pSpline, qreal angle1, const QString &angle1F, qreal angle2,
const QString &angle2F, qreal length1, const QString &length1F, qreal length2,
const QString &length2F)
: pSpline(pSpline),
angle1(angle1),
angle1F(angle1F),
angle2(angle2),
angle2F(angle2F),
length1(length1),
length1F(length1F),
length2(length2),
length2F(length2F)
{
if (not VFuzzyComparePossibleNulls(qAbs(angle1-angle2), 180))
{
qDebug()<<"Make angle1 and angle2 correct.";
QLineF line (0, 0, 100, 0);
if (not qmu::QmuTokenParser::IsSingle(angle1F) || qmu::QmuTokenParser::IsSingle(angle2F))
{
line.setAngle(angle1 + 180);
this->angle2 = line.angle();
this->angle2F = QString().number(line.angle());
}
else
{
line.setAngle(angle2 + 180);
this->angle1 = line.angle();
this->angle1F = QString().number(line.angle());
}
}
}
//---------------------------------------------------------------------------------------------------------------------
VSplinePointData::~VSplinePointData() VSplinePointData::~VSplinePointData()
{} {}