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

Resolved issue #461. Improve feature: Add a keyboard shortcut for getting pure 45, 90, 135, 180, 225, 270, 315 and 0 degree angles for all tools.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2016-07-03 07:50:14 +03:00
parent 14afb2ce9b
commit 01f66d3c34
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
View File

@ -261,6 +261,10 @@ VSpline VAbstractSpline::CorrectedSpline(const VSpline &spline, const SplinePoin
if (position == SplinePointPosition::FirstPoint) if (position == SplinePointPosition::FirstPoint)
{ {
QLineF line(spline.GetP1(), pos); QLineF line(spline.GetP1(), pos);
if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
{
line.setAngle(VisLine::CorrectAngle(line.angle()));
}
qreal newAngle1 = line.angle(); qreal newAngle1 = line.angle();
QString newAngle1F = QString().setNum(newAngle1); QString newAngle1F = QString().setNum(newAngle1);
@ -287,6 +291,10 @@ VSpline VAbstractSpline::CorrectedSpline(const VSpline &spline, const SplinePoin
else else
{ {
QLineF line(spline.GetP4(), pos); QLineF line(spline.GetP4(), pos);
if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
{
line.setAngle(VisLine::CorrectAngle(line.angle()));
}
qreal newAngle2 = line.angle(); qreal newAngle2 = line.angle();
QString newAngle2F = QString().setNum(newAngle2); QString newAngle2F = QString().setNum(newAngle2);

1
src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
View File

@ -30,6 +30,7 @@
#define VABSTRACTSPLINE_H #define VABSTRACTSPLINE_H
#include "../vdrawtool.h" #include "../vdrawtool.h"
#include "visualization/line/visline.h"
#include <QGraphicsPathItem> #include <QGraphicsPathItem>

2
src/libs/vtools/visualization/line/visline.cpp
View File

@ -43,7 +43,7 @@ VisLine::~VisLine()
{} {}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal VisLine::CorrectAngle(const qreal &angle) const qreal VisLine::CorrectAngle(const qreal &angle)
{ {
qreal ang = angle; qreal ang = angle;
if (angle > 360) if (angle > 360)

2
src/libs/vtools/visualization/line/visline.h
View File

@ -44,8 +44,8 @@ public:
virtual int type() const Q_DECL_OVERRIDE {return Type;} virtual int type() const Q_DECL_OVERRIDE {return Type;}
enum { Type = UserType + static_cast<int>(Vis::Line)}; enum { Type = UserType + static_cast<int>(Vis::Line)};
static qreal CorrectAngle(const qreal &angle);
protected: protected:
qreal CorrectAngle(const qreal &angle) const;
QPointF Ray(const QPointF &firstPoint, const qreal &angle) const; QPointF Ray(const QPointF &firstPoint, const qreal &angle) const;
QPointF Ray(const QPointF &firstPoint) const; QPointF Ray(const QPointF &firstPoint) const;
QLineF Axis(const QPointF &p, const qreal &angle) const; QLineF Axis(const QPointF &p, const qreal &angle) const;