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

Fix calculating a piece bounding rect.

Browse Source 
If the piece will have incorrect shape user will see drawing artifacts.
This commit is contained in:
Roman Telezhynskyi 2021-08-18 20:47:49 +03:00
parent a35e46f845
commit cfb8c1b1f4
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/puzzle/scene/vpgraphicspiece.cpp
View File

@ -81,13 +81,17 @@ auto VPGraphicsPiece::GetPiece() -> VPPiecePtr
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
auto VPGraphicsPiece::boundingRect() const -> QRectF auto VPGraphicsPiece::boundingRect() const -> QRectF
{ {
constexpr qreal halfPenWidth = penWidth/2.; QPainterPath shape;
if(!m_cuttingLine.isEmpty()) shape.addPath(m_seamLine);
{ shape.addPath(m_cuttingLine);
return m_cuttingLine.boundingRect().adjusted(-halfPenWidth, -halfPenWidth, halfPenWidth, halfPenWidth); shape.addPath(m_grainline);
} shape.addPath(m_internalPaths);
shape.addPath(m_passmarks);
shape.addPath(m_placeLabels);
return m_seamLine.boundingRect().adjusted(-halfPenWidth, -halfPenWidth, halfPenWidth, halfPenWidth); constexpr qreal halfPenWidth = penWidth/2.;
return shape.boundingRect().adjusted(-halfPenWidth, -halfPenWidth, halfPenWidth, halfPenWidth);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -214,6 +218,13 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
QBrush noBrush(Qt::NoBrush); QBrush noBrush(Qt::NoBrush);
QBrush selectionBrush(QColor(255,160,160,60)); QBrush selectionBrush(QColor(255,160,160,60));
m_seamLine = QPainterPath();
m_cuttingLine = QPainterPath();
m_grainline = QPainterPath();
m_internalPaths = QPainterPath();
m_passmarks = QPainterPath();
m_placeLabels = QPainterPath();
VPPiecePtr piece = m_piece.toStrongRef(); VPPiecePtr piece = m_piece.toStrongRef();
if (piece.isNull()) if (piece.isNull())
{ {
@ -224,7 +235,6 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
QVector<QPointF> seamLinePoints = piece->GetMappedContourPoints(); QVector<QPointF> seamLinePoints = piece->GetMappedContourPoints();
if(!seamLinePoints.isEmpty()) if(!seamLinePoints.isEmpty())
{ {
m_seamLine = QPainterPath();
m_seamLine.moveTo(seamLinePoints.first()); m_seamLine.moveTo(seamLinePoints.first());
for (int i = 1; i < seamLinePoints.size(); i++) for (int i = 1; i < seamLinePoints.size(); i++)
{ {
@ -244,7 +254,6 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
QVector<QPointF> cuttingLinepoints = piece->GetMappedSeamAllowancePoints(); QVector<QPointF> cuttingLinepoints = piece->GetMappedSeamAllowancePoints();
if(!cuttingLinepoints.isEmpty()) if(!cuttingLinepoints.isEmpty())
{ {
m_cuttingLine = QPainterPath();
m_cuttingLine.moveTo(cuttingLinepoints.first()); m_cuttingLine.moveTo(cuttingLinepoints.first());
for (int i = 1; i < cuttingLinepoints.size(); i++) for (int i = 1; i < cuttingLinepoints.size(); i++)
{ {
@ -266,11 +275,10 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
QVector<QPointF> grainLinepoints = piece->GetMappedGrainline(); QVector<QPointF> grainLinepoints = piece->GetMappedGrainline();
if(!grainLinepoints.isEmpty()) if(!grainLinepoints.isEmpty())
{ {
QPainterPath grainline; m_grainline.moveTo(grainLinepoints.first());
grainline.moveTo(grainLinepoints.first());
for (int i = 1; i < grainLinepoints.size(); i++) for (int i = 1; i < grainLinepoints.size(); i++)
{ {
grainline.lineTo(grainLinepoints.at(i)); m_grainline.lineTo(grainLinepoints.at(i));
} }
if (painter != nullptr) if (painter != nullptr)
@ -281,7 +289,7 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
// painter->setBrush(blackBrush); // painter->setBrush(blackBrush);
painter->setBrush(noBrush); painter->setBrush(noBrush);
painter->drawPath(grainline); painter->drawPath(m_grainline);
painter->restore(); painter->restore();
} }
} }
@ -300,6 +308,7 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
painter->drawPath(path); painter->drawPath(path);
painter->restore(); painter->restore();
} }
m_internalPaths.addPath(path);
} }
// initialises the passmarks // initialises the passmarks
@ -320,6 +329,8 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
painter->drawPath(passmarkPath); painter->drawPath(passmarkPath);
painter->restore(); painter->restore();
} }
m_passmarks.addPath(passmarkPath);
} }
// initialises the place labels (buttons etc) // initialises the place labels (buttons etc)
@ -335,6 +346,8 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
painter->drawPath(path); painter->drawPath(path);
painter->restore(); painter->restore();
} }
m_placeLabels.addPath(path);
} }
// TODO : initialises the text labels // TODO : initialises the text labels

4
src/app/puzzle/scene/vpgraphicspiece.h
View File

@ -78,6 +78,10 @@ private:
QPainterPath m_cuttingLine{}; QPainterPath m_cuttingLine{};
QPainterPath m_seamLine{}; QPainterPath m_seamLine{};
QPainterPath m_grainline{};
QPainterPath m_internalPaths{};
QPainterPath m_passmarks{};
QPainterPath m_placeLabels{};
QPointF m_moveStartPoint{}; QPointF m_moveStartPoint{};
QPointF m_rotationStartPoint{}; QPointF m_rotationStartPoint{};