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

Fix grainline's resize rectangle position.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-03-10 16:45:41 +02:00
parent 4bec2bb815
commit bf409006f5
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,48 +513,40 @@ void VGrainlineItem::Update()
*/ */
void VGrainlineItem::UpdateRectangle() void VGrainlineItem::UpdateRectangle()
{ {
m_polyBound.clear();
QPointF pt1(0, 0); QPointF pt1(0, 0);
QPointF pt2; QPointF pt2(pt1.x() + m_dLength * cos(m_dRotation), pt1.y() - m_dLength * sin(m_dRotation));
pt2.setX(pt1.x() + m_dLength * cos(m_dRotation));
pt2.setY(pt1.y() - m_dLength * sin(m_dRotation));
m_ptStart = mapToParent(pt1); m_ptStart = mapToParent(pt1);
m_ptFinish = mapToParent(pt2); m_ptFinish = mapToParent(pt2);
m_ptCenter = (m_ptStart + m_ptFinish)/2; m_ptCenter = (m_ptStart + m_ptFinish)/2;
QPointF ptA; m_polyBound.clear();
ptA.setX(pt1.x() + RECT_WIDTH*cos(m_dRotation + M_PI/2)); m_polyBound << QPointF(pt1.x() + RECT_WIDTH*cos(m_dRotation + M_PI/2),
ptA.setY(pt1.y() - RECT_WIDTH*sin(m_dRotation + M_PI/2)); pt1.y() - RECT_WIDTH*sin(m_dRotation + M_PI/2));
m_polyBound << ptA; m_polyBound << QPointF(pt1.x() + RECT_WIDTH*cos(m_dRotation - M_PI/2),
ptA.setX(pt1.x() + RECT_WIDTH*cos(m_dRotation - M_PI/2)); pt1.y() - RECT_WIDTH*sin(m_dRotation - M_PI/2));
ptA.setY(pt1.y() - RECT_WIDTH*sin(m_dRotation - M_PI/2)); m_polyBound << QPointF(pt2.x() + RECT_WIDTH*cos(m_dRotation - M_PI/2),
m_polyBound << ptA; pt2.y() - RECT_WIDTH*sin(m_dRotation - M_PI/2));
ptA.setX(pt2.x() + RECT_WIDTH*cos(m_dRotation - M_PI/2)); m_polyBound << QPointF(pt2.x() + RECT_WIDTH*cos(m_dRotation + M_PI/2),
ptA.setY(pt2.y() - RECT_WIDTH*sin(m_dRotation - M_PI/2)); pt2.y() - RECT_WIDTH*sin(m_dRotation + M_PI/2));
m_polyBound << ptA;
ptA.setX(pt2.x() + RECT_WIDTH*cos(m_dRotation + M_PI/2));
ptA.setY(pt2.y() - RECT_WIDTH*sin(m_dRotation + M_PI/2));
m_polyBound << ptA;
m_rectBoundingBox = m_polyBound.boundingRect(); m_rectBoundingBox = m_polyBound.boundingRect();
setTransformOriginPoint(m_rectBoundingBox.center()); setTransformOriginPoint(m_rectBoundingBox.center());
m_polyResize.clear(); m_polyResize.clear();
ptA = m_polyBound.at(2); QPointF ptA = m_polyBound.at(3);
m_polyResize << ptA; m_polyResize << ptA;
double dSize = m_dScale * RESIZE_RECT_SIZE; const double dSize = m_dScale * RESIZE_RECT_SIZE;
ptA.setX(ptA.x() + dSize*cos(m_dRotation + M_PI/2)); ptA.setX(ptA.x() + dSize*cos(m_dRotation - M_PI/2));
ptA.setY(ptA.y() - dSize*sin(m_dRotation + M_PI/2)); ptA.setY(ptA.y() - dSize*sin(m_dRotation - M_PI/2));
m_polyResize << ptA; m_polyResize << ptA;
ptA.setX(ptA.x() - dSize*cos(m_dRotation)); ptA.setX(ptA.x() - dSize*cos(m_dRotation));
ptA.setY(ptA.y() + dSize*sin(m_dRotation)); ptA.setY(ptA.y() + dSize*sin(m_dRotation));
m_polyResize << ptA; m_polyResize << ptA;
ptA.setX(ptA.x() + dSize*cos(m_dRotation - M_PI/2)); ptA.setX(ptA.x() + dSize*cos(m_dRotation + M_PI/2));
ptA.setY(ptA.y() - dSize*sin(m_dRotation - M_PI/2)); ptA.setY(ptA.y() - dSize*sin(m_dRotation + M_PI/2));
m_polyResize << ptA; m_polyResize << ptA;
prepareGeometryChange(); prepareGeometryChange();