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

Fix issue with angle direction of grainline.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-03-14 11:11:35 +02:00
parent 011f0eaec0
commit de6e3d7213
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -756,7 +756,7 @@ void VToolSeamAllowance::SaveRotationPattern(qreal dRot)
// Tranform angle to anticlockwise // Tranform angle to anticlockwise
QLineF line(0, 0, 100, 0); QLineF line(0, 0, 100, 0);
line.setAngle(-dRot); line.setAngle(-dRot);
newDet.GetPatternInfo().SetRotation(QString().setNum(dRot)); newDet.GetPatternInfo().SetRotation(QString().setNum(line.angle()));
SavePieceOptions* rotateCommand = new SavePieceOptions(oldDet, newDet, doc, id); SavePieceOptions* rotateCommand = new SavePieceOptions(oldDet, newDet, doc, id);
rotateCommand->setText(tr("rotate pattern info label")); rotateCommand->setText(tr("rotate pattern info label"));

26
src/libs/vwidgets/vgrainlineitem.cpp
View File

@ -666,19 +666,6 @@ QLineF VGrainlineItem::MainLine() const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QPolygonF VGrainlineItem::FirstArrow(qreal dArrLen) const QPolygonF VGrainlineItem::FirstArrow(qreal dArrLen) const
{
const QPointF pt1 = MainLine().p1();
QPolygonF poly;
poly << pt1;
poly << QPointF(pt1.x() + dArrLen*cos(m_dRotation + ARROW_ANGLE),
pt1.y() - dArrLen*sin(m_dRotation + ARROW_ANGLE));
poly << QPointF(pt1.x() + dArrLen*cos(m_dRotation - ARROW_ANGLE),
pt1.y() - dArrLen*sin(m_dRotation - ARROW_ANGLE));
return poly;
}
//---------------------------------------------------------------------------------------------------------------------
QPolygonF VGrainlineItem::SecondArrow(qreal dArrLen) const
{ {
const QPointF pt2 = MainLine().p2(); const QPointF pt2 = MainLine().p2();
QPolygonF poly; QPolygonF poly;
@ -690,6 +677,19 @@ QPolygonF VGrainlineItem::SecondArrow(qreal dArrLen) const
return poly; return poly;
} }
//---------------------------------------------------------------------------------------------------------------------
QPolygonF VGrainlineItem::SecondArrow(qreal dArrLen) const
{
const QPointF pt1 = MainLine().p1();
QPolygonF poly;
poly << pt1;
poly << QPointF(pt1.x() + dArrLen*cos(m_dRotation + ARROW_ANGLE),
pt1.y() - dArrLen*sin(m_dRotation + ARROW_ANGLE));
poly << QPointF(pt1.x() + dArrLen*cos(m_dRotation - ARROW_ANGLE),
pt1.y() - dArrLen*sin(m_dRotation - ARROW_ANGLE));
return poly;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QPainterPath VGrainlineItem::MainShape() const QPainterPath VGrainlineItem::MainShape() const
{ {