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

Update an angle during processing editing rotation.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-05-19 15:56:50 +03:00
parent 7665402d64
commit e2a059287e
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/vtools/visualization/line/vistoolrotation.cpp
View File

@ -77,6 +77,8 @@ void VisToolRotation::RefreshGeometry()
QSharedPointer<VPointF> origin = QSharedPointer<VPointF>(new VPointF()); QSharedPointer<VPointF> origin = QSharedPointer<VPointF>(new VPointF());
qreal tempAngle = 0;
if (object1Id != NULL_ID) if (object1Id != NULL_ID)
{ {
origin = Visualization::data->GeometricObject<VPointF>(object1Id); origin = Visualization::data->GeometricObject<VPointF>(object1Id);
@ -93,20 +95,22 @@ void VisToolRotation::RefreshGeometry()
} }
rLine.setP2(Ray(*origin, rLine.angle())); rLine.setP2(Ray(*origin, rLine.angle()));
tempAngle = rLine.angle();
} }
else else
{ {
rLine = QLineF(*origin, Ray(*origin, angle)); rLine = QLineF(*origin, Ray(*origin, angle));
tempAngle = angle;
} }
DrawLine(this, rLine, supportColor2, Qt::DashLine); DrawLine(this, rLine, supportColor2, Qt::DashLine);
DrawLine(xAxis, QLineF(*origin, Ray(*origin, 0)), supportColor2, Qt::DashLine); DrawLine(xAxis, QLineF(*origin, Ray(*origin, 0)), supportColor2, Qt::DashLine);
VArc arc(*origin, ToPixel(DefPointRadius/*mm*/*2, Unit::Mm), 0, rLine.angle()); VArc arc(*origin, ToPixel(DefPointRadius/*mm*/*2, Unit::Mm), 0, tempAngle);
DrawPath(angleArc, arc.GetPath(PathDirection::Hide), supportColor2, Qt::SolidLine, Qt::RoundCap); DrawPath(angleArc, arc.GetPath(PathDirection::Hide), supportColor2, Qt::SolidLine, Qt::RoundCap);
Visualization::toolTip = tr("Rotating angle = %1°, <b>Shift</b> - sticking angle, " Visualization::toolTip = tr("Rotating angle = %1°, <b>Shift</b> - sticking angle, "
"<b>Mouse click</b> - finish creation").arg(rLine.angle()); "<b>Mouse click</b> - finish creation").arg(tempAngle);
} }
int iPoint = -1; int iPoint = -1;
@ -134,38 +138,38 @@ void VisToolRotation::RefreshGeometry()
if (object1Id != NULL_ID) if (object1Id != NULL_ID)
{ {
DrawPoint(point, p->Rotate(*origin, angle), supportColor); DrawPoint(point, p->Rotate(*origin, tempAngle), supportColor);
} }
break; break;
} }
case GOType::Arc: case GOType::Arc:
{ {
iCurve = AddCurve<VArc>(*origin, id, iCurve); iCurve = AddCurve<VArc>(tempAngle, *origin, id, iCurve);
break; break;
} }
case GOType::EllipticalArc: case GOType::EllipticalArc:
{ {
iCurve = AddCurve<VEllipticalArc>(*origin, id, iCurve); iCurve = AddCurve<VEllipticalArc>(tempAngle, *origin, id, iCurve);
break; break;
} }
case GOType::Spline: case GOType::Spline:
{ {
iCurve = AddCurve<VSpline>(*origin, id, iCurve); iCurve = AddCurve<VSpline>(tempAngle, *origin, id, iCurve);
break; break;
} }
case GOType::SplinePath: case GOType::SplinePath:
{ {
iCurve = AddCurve<VSplinePath>(*origin, id, iCurve); iCurve = AddCurve<VSplinePath>(tempAngle, *origin, id, iCurve);
break; break;
} }
case GOType::CubicBezier: case GOType::CubicBezier:
{ {
iCurve = AddCurve<VCubicBezier>(*origin, id, iCurve); iCurve = AddCurve<VCubicBezier>(tempAngle, *origin, id, iCurve);
break; break;
} }
case GOType::CubicBezierPath: case GOType::CubicBezierPath:
{ {
iCurve = AddCurve<VCubicBezierPath>(*origin, id, iCurve); iCurve = AddCurve<VCubicBezierPath>(tempAngle, *origin, id, iCurve);
break; break;
} }
case GOType::Unknown: case GOType::Unknown:
@ -249,7 +253,7 @@ QGraphicsPathItem *VisToolRotation::GetCurve(quint32 i, const QColor &color)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <class Item> template <class Item>
int VisToolRotation::AddCurve(const QPointF &origin, quint32 id, int i) int VisToolRotation::AddCurve(qreal angle, const QPointF &origin, quint32 id, int i)
{ {
const QSharedPointer<Item> curve = Visualization::data->GeometricObject<Item>(id); const QSharedPointer<Item> curve = Visualization::data->GeometricObject<Item>(id);

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

@ -66,7 +66,7 @@ private:
QGraphicsPathItem * GetCurve(quint32 i, const QColor &color); QGraphicsPathItem * GetCurve(quint32 i, const QColor &color);
template <class Item> template <class Item>
int AddCurve(const QPointF &origin, quint32 id, int i); int AddCurve(qreal angle, const QPointF &origin, quint32 id, int i);
}; };
#endif // VISTOOLROTATION_H #endif // VISTOOLROTATION_H