From 45be7271bb5dff80b06329b6f7d36dd64475b94a Mon Sep 17 00:00:00 2001 From: Ronan Le Tiec Date: Sat, 23 May 2020 14:50:22 +0200 Subject: [PATCH] Refactoring VPuzzleGraphicsPiece --- src/app/puzzle/puzzle.pri | 4 +- ...egraphicspiece.cpp => vpgraphicspiece.cpp} | 48 +++++++++---------- ...uzzlegraphicspiece.h => vpgraphicspiece.h} | 16 +++---- src/app/puzzle/vpuzzlemaingraphicsview.cpp | 6 +-- src/app/puzzle/vpuzzlemaingraphicsview.h | 4 +- 5 files changed, 39 insertions(+), 39 deletions(-) rename src/app/puzzle/{vpuzzlegraphicspiece.cpp => vpgraphicspiece.cpp} (86%) rename src/app/puzzle/{vpuzzlegraphicspiece.h => vpgraphicspiece.h} (89%) diff --git a/src/app/puzzle/puzzle.pri b/src/app/puzzle/puzzle.pri index 2b0317e0b..53d116bb4 100644 --- a/src/app/puzzle/puzzle.pri +++ b/src/app/puzzle/puzzle.pri @@ -11,9 +11,9 @@ SOURCES += \ $$PWD/vpcarrouselpiecepreview.cpp \ $$PWD/vpcommandline.cpp \ $$PWD/vpcommands.cpp \ + $$PWD/vpgraphicspiece.cpp \ $$PWD/vpgraphicssheet.cpp \ $$PWD/vpmainwindow.cpp \ - $$PWD/vpuzzlegraphicspiece.cpp \ $$PWD/vpuzzlelayout.cpp \ $$PWD/vpuzzlelayer.cpp \ $$PWD/vpuzzlemaingraphicsview.cpp \ @@ -35,10 +35,10 @@ HEADERS += \ $$PWD/vpcarrouselpiecepreview.h \ $$PWD/vpcommandline.h \ $$PWD/vpcommands.h \ + $$PWD/vpgraphicspiece.h \ $$PWD/vpgraphicssheet.h \ $$PWD/vpmainwindow.h \ $$PWD/vpstable.h \ - $$PWD/vpuzzlegraphicspiece.h \ $$PWD/vpuzzlelayout.h \ $$PWD/vpuzzlelayer.h \ $$PWD/vpuzzlemaingraphicsview.h \ diff --git a/src/app/puzzle/vpuzzlegraphicspiece.cpp b/src/app/puzzle/vpgraphicspiece.cpp similarity index 86% rename from src/app/puzzle/vpuzzlegraphicspiece.cpp rename to src/app/puzzle/vpgraphicspiece.cpp index 30f1af656..25faf76af 100644 --- a/src/app/puzzle/vpuzzlegraphicspiece.cpp +++ b/src/app/puzzle/vpgraphicspiece.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpuzzlegraphicspiece.cpp + ** @file vpgraphicspiece.cpp ** @author Ronan Le Tiec ** @date 4 5, 2020 ** @@ -26,7 +26,7 @@ ** *************************************************************************/ -#include "vpuzzlegraphicspiece.h" +#include "vpgraphicspiece.h" #include #include @@ -47,7 +47,7 @@ Q_LOGGING_CATEGORY(pGraphicsPiece, "p.graphicsPiece") //--------------------------------------------------------------------------------------------------------------------- -VPuzzleGraphicsPiece::VPuzzleGraphicsPiece(VPuzzlePiece *piece, QGraphicsItem *parent) : +VPGraphicsPiece::VPGraphicsPiece(VPuzzlePiece *piece, QGraphicsItem *parent) : QGraphicsObject(parent), m_piece(piece), m_cuttingLine(QPainterPath()), @@ -59,13 +59,13 @@ VPuzzleGraphicsPiece::VPuzzleGraphicsPiece(VPuzzlePiece *piece, QGraphicsItem *p } //--------------------------------------------------------------------------------------------------------------------- -VPuzzleGraphicsPiece::~VPuzzleGraphicsPiece() +VPGraphicsPiece::~VPGraphicsPiece() { } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::Init() +void VPGraphicsPiece::Init() { // set some infos setFlags(ItemIsSelectable | ItemIsMovable | ItemSendsGeometryChanges); @@ -102,19 +102,19 @@ void VPuzzleGraphicsPiece::Init() // TODO : initialises the other elements labels, passmarks etc. // Initialises the connectors - connect(m_piece, &VPuzzlePiece::SelectionChanged, this, &VPuzzleGraphicsPiece::on_PieceSelectionChanged); - connect(m_piece, &VPuzzlePiece::PositionChanged, this, &VPuzzleGraphicsPiece::on_PiecePositionChanged); - connect(m_piece, &VPuzzlePiece::RotationChanged, this, &VPuzzleGraphicsPiece::on_PieceRotationChanged); + connect(m_piece, &VPuzzlePiece::SelectionChanged, this, &VPGraphicsPiece::on_PieceSelectionChanged); + connect(m_piece, &VPuzzlePiece::PositionChanged, this, &VPGraphicsPiece::on_PiecePositionChanged); + connect(m_piece, &VPuzzlePiece::RotationChanged, this, &VPGraphicsPiece::on_PieceRotationChanged); } //--------------------------------------------------------------------------------------------------------------------- -VPuzzlePiece* VPuzzleGraphicsPiece::GetPiece() +VPuzzlePiece* VPGraphicsPiece::GetPiece() { return m_piece; } //--------------------------------------------------------------------------------------------------------------------- -QRectF VPuzzleGraphicsPiece::boundingRect() const +QRectF VPGraphicsPiece::boundingRect() const { if(!m_cuttingLine.isEmpty()) { @@ -125,7 +125,7 @@ QRectF VPuzzleGraphicsPiece::boundingRect() const } //--------------------------------------------------------------------------------------------------------------------- -QPainterPath VPuzzleGraphicsPiece::shape() const +QPainterPath VPGraphicsPiece::shape() const { if(!m_cuttingLine.isEmpty()) { @@ -136,7 +136,7 @@ QPainterPath VPuzzleGraphicsPiece::shape() const } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void VPGraphicsPiece::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { Q_UNUSED(widget); Q_UNUSED(option); @@ -179,7 +179,7 @@ void VPuzzleGraphicsPiece::paint(QPainter *painter, const QStyleOptionGraphicsIt } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::mousePressEvent(QGraphicsSceneMouseEvent *event) +void VPGraphicsPiece::mousePressEvent(QGraphicsSceneMouseEvent *event) { bool selectionState = isSelected(); //perform the default behaviour @@ -214,7 +214,7 @@ void VPuzzleGraphicsPiece::mousePressEvent(QGraphicsSceneMouseEvent *event) } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::mouseMoveEvent(QGraphicsSceneMouseEvent * event) +void VPGraphicsPiece::mouseMoveEvent(QGraphicsSceneMouseEvent * event) { if((event->buttons() == Qt::LeftButton) && (event->modifiers() & Qt::AltModifier)) { @@ -245,7 +245,7 @@ void VPuzzleGraphicsPiece::mouseMoveEvent(QGraphicsSceneMouseEvent * event) //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +void VPGraphicsPiece::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { bool selectionState = isSelected(); @@ -272,7 +272,7 @@ void VPuzzleGraphicsPiece::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +void VPGraphicsPiece::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { if(event->modifiers() & Qt::AltModifier) @@ -292,7 +292,7 @@ void VPuzzleGraphicsPiece::hoverMoveEvent(QGraphicsSceneHoverEvent *event) } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +void VPGraphicsPiece::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { QMenu contextMenu; @@ -312,7 +312,7 @@ void VPuzzleGraphicsPiece::contextMenuEvent(QGraphicsSceneContextMenuEvent *even QVariant data = QVariant::fromValue(layer); moveToLayer->setData(data); - connect(moveToLayer, &QAction::triggered, this, &VPuzzleGraphicsPiece::on_ActionPieceMovedToLayer); + connect(moveToLayer, &QAction::triggered, this, &VPGraphicsPiece::on_ActionPieceMovedToLayer); } } @@ -320,13 +320,13 @@ void VPuzzleGraphicsPiece::contextMenuEvent(QGraphicsSceneContextMenuEvent *even QAction *removeAction = contextMenu.addAction(tr("Remove from Layout")); QVariant data = QVariant::fromValue(m_piece->GetLayer()->GetLayout()->GetUnplacedPiecesLayer()); removeAction->setData(data); - connect(removeAction, &QAction::triggered, this, &VPuzzleGraphicsPiece::on_ActionPieceMovedToLayer); + connect(removeAction, &QAction::triggered, this, &VPGraphicsPiece::on_ActionPieceMovedToLayer); contextMenu.exec(event->screenPos()); } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::on_ActionPieceMovedToLayer() +void VPGraphicsPiece::on_ActionPieceMovedToLayer() { QAction *act = qobject_cast(sender()); QVariant v = act->data(); @@ -339,26 +339,26 @@ void VPuzzleGraphicsPiece::on_ActionPieceMovedToLayer() //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::on_PieceSelectionChanged() +void VPGraphicsPiece::on_PieceSelectionChanged() { setSelected(m_piece->GetIsSelected()); } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::on_PiecePositionChanged() +void VPGraphicsPiece::on_PiecePositionChanged() { setPos(m_piece->GetPosition()); } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleGraphicsPiece::on_PieceRotationChanged() +void VPGraphicsPiece::on_PieceRotationChanged() { setTransformOriginPoint(boundingRect().center()); setRotation(-m_piece->GetRotation()); } //--------------------------------------------------------------------------------------------------------------------- -QVariant VPuzzleGraphicsPiece::itemChange(GraphicsItemChange change, const QVariant &value) +QVariant VPGraphicsPiece::itemChange(GraphicsItemChange change, const QVariant &value) { if (scene()) { diff --git a/src/app/puzzle/vpuzzlegraphicspiece.h b/src/app/puzzle/vpgraphicspiece.h similarity index 89% rename from src/app/puzzle/vpuzzlegraphicspiece.h rename to src/app/puzzle/vpgraphicspiece.h index fee04892f..718687c87 100644 --- a/src/app/puzzle/vpuzzlegraphicspiece.h +++ b/src/app/puzzle/vpgraphicspiece.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpuzzlegraphicspiece.h + ** @file vpgraphicspiece.h ** @author Ronan Le Tiec ** @date 4 5, 2020 ** @@ -26,19 +26,19 @@ ** *************************************************************************/ -#ifndef VPUZZLEGRAPHICSPIECE_H -#define VPUZZLEGRAPHICSPIECE_H +#ifndef VPGRAPHICSPIECE_H +#define VPGRAPHICSPIECE_H #include class VPuzzlePiece; -class VPuzzleGraphicsPiece : public QGraphicsObject +class VPGraphicsPiece : public QGraphicsObject { Q_OBJECT public: - VPuzzleGraphicsPiece(VPuzzlePiece *piece, QGraphicsItem *parent = nullptr); - ~VPuzzleGraphicsPiece(); + VPGraphicsPiece(VPuzzlePiece *piece, QGraphicsItem *parent = nullptr); + ~VPGraphicsPiece(); void Init(); /** @@ -86,7 +86,7 @@ private slots: void on_ActionPieceMovedToLayer(); private: - Q_DISABLE_COPY(VPuzzleGraphicsPiece) + Q_DISABLE_COPY(VPGraphicsPiece) VPuzzlePiece *m_piece; QPainterPath m_cuttingLine; @@ -97,4 +97,4 @@ private: }; -#endif // VPUZZLEGRAPHICSPIECE_H +#endif // VPGRAPHICSPIECE_H diff --git a/src/app/puzzle/vpuzzlemaingraphicsview.cpp b/src/app/puzzle/vpuzzlemaingraphicsview.cpp index da3589dc8..3045f719a 100644 --- a/src/app/puzzle/vpuzzlemaingraphicsview.cpp +++ b/src/app/puzzle/vpuzzlemaingraphicsview.cpp @@ -137,7 +137,7 @@ void VPuzzleMainGraphicsView::keyPressEvent(QKeyEvent *event) { if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { - QList tmpGraphicsPieces = m_graphicsPieces; + QList tmpGraphicsPieces = m_graphicsPieces; for(auto graphicsPiece : tmpGraphicsPieces) { @@ -157,7 +157,7 @@ void VPuzzleMainGraphicsView::on_PieceMovedToLayer(VPuzzlePiece *piece, VPuzzleL { Q_UNUSED(layerBefore) - VPuzzleGraphicsPiece *_graphicsPiece = nullptr; + VPGraphicsPiece *_graphicsPiece = nullptr; for(auto graphicPiece : m_graphicsPieces) { if(graphicPiece->GetPiece() == piece) @@ -175,7 +175,7 @@ void VPuzzleMainGraphicsView::on_PieceMovedToLayer(VPuzzlePiece *piece, VPuzzleL { if(_graphicsPiece == nullptr) { - _graphicsPiece = new VPuzzleGraphicsPiece(piece); + _graphicsPiece = new VPGraphicsPiece(piece); m_graphicsPieces.append(_graphicsPiece); } diff --git a/src/app/puzzle/vpuzzlemaingraphicsview.h b/src/app/puzzle/vpuzzlemaingraphicsview.h index e138f4cae..100356361 100644 --- a/src/app/puzzle/vpuzzlemaingraphicsview.h +++ b/src/app/puzzle/vpuzzlemaingraphicsview.h @@ -30,7 +30,7 @@ #define VPUZZLEMAINGRAPHICSVIEW_H #include "vpgraphicssheet.h" -#include "vpuzzlegraphicspiece.h" +#include "vpgraphicspiece.h" #include "../vwidgets/vmaingraphicsview.h" class VMainGraphicsScene; @@ -79,7 +79,7 @@ private: VPGraphicsSheet *m_graphicsSheet{nullptr}; VPuzzleLayout *m_layout{nullptr}; - QList m_graphicsPieces{}; + QList m_graphicsPieces{}; };