Work on layer and graphics view behaviour
This commit is contained in:
parent
d72be9029f
commit
6c35dfc78a
|
@ -93,8 +93,8 @@ void VPieceCarrousel::Init()
|
||||||
mainLayout->addWidget(m_scrollArea);
|
mainLayout->addWidget(m_scrollArea);
|
||||||
|
|
||||||
// ------ then we fill the carrousel with the layout content
|
// ------ then we fill the carrousel with the layout content
|
||||||
Refresh();
|
Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VPieceCarrousel::Refresh()
|
void VPieceCarrousel::Refresh()
|
||||||
|
|
|
@ -76,7 +76,6 @@ public:
|
||||||
*/
|
*/
|
||||||
void ClearSelection();
|
void ClearSelection();
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Q_DISABLE_COPY(VPieceCarrousel)
|
Q_DISABLE_COPY(VPieceCarrousel)
|
||||||
|
|
||||||
|
@ -92,6 +91,11 @@ private:
|
||||||
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief on_ActiveLayerChanged Called when the active layer is changed
|
||||||
|
* @param index
|
||||||
|
*/
|
||||||
void on_ActiveLayerChanged(int index);
|
void on_ActiveLayerChanged(int index);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ VPieceCarrouselLayer::VPieceCarrouselLayer(VPuzzleLayer *layer, VPieceCarrousel
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPieceCarrouselLayer::~VPieceCarrouselLayer()
|
VPieceCarrouselLayer::~VPieceCarrouselLayer()
|
||||||
{
|
{
|
||||||
// TODO
|
Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -61,13 +61,16 @@ void VPieceCarrouselLayer::Init()
|
||||||
|
|
||||||
// then refresh the content
|
// then refresh the content
|
||||||
Refresh();
|
Refresh();
|
||||||
|
|
||||||
|
// add the connections
|
||||||
|
connect(m_layer, &VPuzzleLayer::PieceAdded, this, &VPieceCarrouselLayer::on_PieceAdded);
|
||||||
|
connect(m_layer, &VPuzzleLayer::PieceRemoved, this, &VPieceCarrouselLayer::on_PieceRemoved);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VPieceCarrouselLayer::Refresh()
|
void VPieceCarrouselLayer::Refresh()
|
||||||
{
|
{
|
||||||
// remove the existing carrousel pieces
|
Clear();
|
||||||
// TODO
|
|
||||||
|
|
||||||
// Updates the carrousel pieces from the pieces list
|
// Updates the carrousel pieces from the pieces list
|
||||||
QList<VPuzzlePiece*> pieces = m_layer->GetPieces();
|
QList<VPuzzlePiece*> pieces = m_layer->GetPieces();
|
||||||
|
@ -78,20 +81,33 @@ void VPieceCarrouselLayer::Refresh()
|
||||||
|
|
||||||
// create the corresponding carrousel pieces
|
// create the corresponding carrousel pieces
|
||||||
|
|
||||||
|
bool _isVisible = isVisible();
|
||||||
|
setVisible(true);
|
||||||
for (auto piece : pieces)
|
for (auto piece : pieces)
|
||||||
{
|
{
|
||||||
// qCDebug(pCarrouselLayer, "piece name : %s", piece->GetName().toStdString().c_str());
|
|
||||||
|
|
||||||
VPieceCarrouselPiece *carrouselPiece = new VPieceCarrouselPiece(piece, this);
|
VPieceCarrouselPiece *carrouselPiece = new VPieceCarrouselPiece(piece, this);
|
||||||
m_carrouselPieces.append(carrouselPiece);
|
m_carrouselPieces.append(carrouselPiece);
|
||||||
layout()->addWidget(carrouselPiece);
|
layout()->addWidget(carrouselPiece);
|
||||||
|
carrouselPiece->CleanPreview(); // fitInView only works if the widget is displayed.
|
||||||
// FIXME? the fitInView inside the refresh of the piece doesn't workd properly.
|
|
||||||
// only by doing the following I did get it to work:
|
|
||||||
setVisible(true);
|
|
||||||
carrouselPiece->CleanPreview();
|
|
||||||
setVisible(false);
|
|
||||||
}
|
}
|
||||||
|
setVisible(_isVisible);
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPieceCarrouselLayer::Clear()
|
||||||
|
{
|
||||||
|
// Removes and deletes the carrousel pieces from the layer
|
||||||
|
while (!m_carrouselPieces.isEmpty())
|
||||||
|
{
|
||||||
|
VPieceCarrouselPiece *carrouselPiece = m_carrouselPieces.takeLast();
|
||||||
|
|
||||||
|
if(carrouselPiece != nullptr)
|
||||||
|
{
|
||||||
|
layout()->removeWidget(carrouselPiece);
|
||||||
|
delete carrouselPiece;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -106,3 +122,34 @@ VPieceCarrousel* VPieceCarrouselLayer::GetCarrousel()
|
||||||
return m_carrousel;
|
return m_carrousel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VPuzzleLayer* VPieceCarrouselLayer::GetLayer()
|
||||||
|
{
|
||||||
|
return m_layer;
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPieceCarrouselLayer::on_PieceAdded(VPuzzlePiece* piece)
|
||||||
|
{
|
||||||
|
Q_UNUSED(piece)
|
||||||
|
|
||||||
|
// TODO/ FIXME: see if we find a solution more efficient refreshing the complete layout everytime.
|
||||||
|
|
||||||
|
Refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPieceCarrouselLayer::on_PieceRemoved(VPuzzlePiece* piece)
|
||||||
|
{
|
||||||
|
for (auto carrouselPiece : m_carrouselPieces)
|
||||||
|
{
|
||||||
|
if(carrouselPiece->GetPiece() == piece)
|
||||||
|
{
|
||||||
|
m_carrouselPieces.removeAll(carrouselPiece);
|
||||||
|
layout()->removeWidget(carrouselPiece);
|
||||||
|
delete carrouselPiece;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -45,10 +45,21 @@ public:
|
||||||
void Init();
|
void Init();
|
||||||
void Refresh();
|
void Refresh();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Clear it clears the carrousel layer from its pieces
|
||||||
|
*/
|
||||||
|
void Clear();
|
||||||
|
|
||||||
QList<VPieceCarrouselPiece*> GetCarrouselPieces();
|
QList<VPieceCarrouselPiece*> GetCarrouselPieces();
|
||||||
|
|
||||||
VPieceCarrousel* GetCarrousel();
|
VPieceCarrousel* GetCarrousel();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief GetPuzzleLayer Returns the corresponding VPuzzleLayer
|
||||||
|
* @return the VPuzzleLayer
|
||||||
|
*/
|
||||||
|
VPuzzleLayer* GetLayer();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Q_DISABLE_COPY(VPieceCarrouselLayer)
|
Q_DISABLE_COPY(VPieceCarrouselLayer)
|
||||||
|
|
||||||
|
@ -58,6 +69,16 @@ private:
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief on_PieceUpdated This slot is called when a piece was added
|
||||||
|
*/
|
||||||
|
void on_PieceAdded(VPuzzlePiece* piece);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief on_PieceUpdated This slot is called when a piece was removed
|
||||||
|
*/
|
||||||
|
void on_PieceRemoved(VPuzzlePiece* piece);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // VPIECECARROUSELLAYER_H
|
#endif // VPIECECARROUSELLAYER_H
|
||||||
|
|
|
@ -99,7 +99,6 @@ void VPieceCarrouselPiece::Init()
|
||||||
// connect the signals
|
// connect the signals
|
||||||
connect(m_piece, &VPuzzlePiece::SelectionChanged, this, &VPieceCarrouselPiece::on_PieceSelectionChanged);
|
connect(m_piece, &VPuzzlePiece::SelectionChanged, this, &VPieceCarrouselPiece::on_PieceSelectionChanged);
|
||||||
|
|
||||||
|
|
||||||
// then refresh the data
|
// then refresh the data
|
||||||
Refresh();
|
Refresh();
|
||||||
}
|
}
|
||||||
|
@ -141,6 +140,9 @@ void VPieceCarrouselPiece::Refresh()
|
||||||
|
|
||||||
// set the tooltip
|
// set the tooltip
|
||||||
setToolTip(m_piece->GetName());
|
setToolTip(m_piece->GetName());
|
||||||
|
|
||||||
|
// set the selection state correctly.
|
||||||
|
on_PieceSelectionChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -162,8 +164,6 @@ void VPieceCarrouselPiece::on_PieceSelectionChanged()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VPieceCarrouselPiece::mousePressEvent(QMouseEvent *event)
|
void VPieceCarrouselPiece::mousePressEvent(QMouseEvent *event)
|
||||||
{
|
{
|
||||||
|
@ -194,6 +194,12 @@ void VPieceCarrouselPiece::mouseMoveEvent(QMouseEvent *event)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(m_piece->GetLayer() != m_piece->GetLayer()->GetLayout()->GetUnplacedPiecesLayer())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if((event->pos() - m_dragStart).manhattanLength() < QApplication::startDragDistance())
|
if((event->pos() - m_dragStart).manhattanLength() < QApplication::startDragDistance())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -31,9 +31,10 @@
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPuzzleGraphicsLayout::VPuzzleGraphicsLayout(VPuzzleLayout *layout, QGraphicsItem *parent):
|
VPuzzleGraphicsLayout::VPuzzleGraphicsLayout(VPuzzleLayout *layout, QGraphicsItem *parent):
|
||||||
QGraphicsItem(parent),
|
QGraphicsItem(parent),
|
||||||
m_layout(layout)
|
m_layout(layout),
|
||||||
|
m_boundingRect(GetLayoutRect())
|
||||||
{
|
{
|
||||||
m_boundingRect = GetLayoutRect();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -90,6 +90,11 @@ void VPuzzleGraphicsPiece::Init()
|
||||||
connect(m_piece, &VPuzzlePiece::PositionChanged, this, &VPuzzleGraphicsPiece::on_PiecePositionChanged);
|
connect(m_piece, &VPuzzlePiece::PositionChanged, this, &VPuzzleGraphicsPiece::on_PiecePositionChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VPuzzlePiece* VPuzzleGraphicsPiece::GetPiece()
|
||||||
|
{
|
||||||
|
return m_piece;
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
QRectF VPuzzleGraphicsPiece::boundingRect() const
|
QRectF VPuzzleGraphicsPiece::boundingRect() const
|
||||||
|
@ -120,20 +125,25 @@ void VPuzzleGraphicsPiece::paint(QPainter *painter, const QStyleOptionGraphicsIt
|
||||||
Q_UNUSED(option);
|
Q_UNUSED(option);
|
||||||
|
|
||||||
QPen pen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
|
QPen pen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
|
||||||
if(isSelected())
|
|
||||||
{
|
|
||||||
pen.setColor(Qt::red);
|
|
||||||
}
|
|
||||||
|
|
||||||
QBrush noBrush(Qt::NoBrush);
|
QBrush noBrush(Qt::NoBrush);
|
||||||
|
QBrush selectionBrush(QColor(255,160,160,60));
|
||||||
|
|
||||||
painter->setPen(pen);
|
painter->setPen(pen);
|
||||||
painter->setBrush(noBrush);
|
|
||||||
|
if(isSelected())
|
||||||
|
{
|
||||||
|
painter->setBrush(selectionBrush);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
painter->setBrush(noBrush);
|
||||||
|
}
|
||||||
|
|
||||||
// paint the cutting line
|
// paint the cutting line
|
||||||
if(!m_cuttingLine.isEmpty())
|
if(!m_cuttingLine.isEmpty())
|
||||||
{
|
{
|
||||||
painter->drawPath(m_cuttingLine);
|
painter->drawPath(m_cuttingLine);
|
||||||
|
painter->setBrush(noBrush);
|
||||||
}
|
}
|
||||||
|
|
||||||
// paint the seam line
|
// paint the seam line
|
||||||
|
@ -142,6 +152,8 @@ void VPuzzleGraphicsPiece::paint(QPainter *painter, const QStyleOptionGraphicsIt
|
||||||
painter->drawPath(m_seamLine);
|
painter->drawPath(m_seamLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
painter->setBrush(noBrush);
|
||||||
|
|
||||||
// paint the grainline
|
// paint the grainline
|
||||||
if(!m_grainline.isEmpty())
|
if(!m_grainline.isEmpty())
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,6 +41,12 @@ public:
|
||||||
~VPuzzleGraphicsPiece();
|
~VPuzzleGraphicsPiece();
|
||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief GetPiece Returns the piece that corresponds to the graphics piece
|
||||||
|
* @return the piece
|
||||||
|
*/
|
||||||
|
VPuzzlePiece* GetPiece();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
/**
|
/**
|
||||||
* @brief on_PieceSelectionChanged When the piece selection was changed
|
* @brief on_PieceSelectionChanged When the piece selection was changed
|
||||||
|
|
|
@ -27,8 +27,15 @@
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
#include "vpuzzlelayer.h"
|
#include "vpuzzlelayer.h"
|
||||||
|
|
||||||
|
#include "vpuzzlelayout.h"
|
||||||
|
|
||||||
|
#include <QLoggingCategory>
|
||||||
|
|
||||||
|
Q_LOGGING_CATEGORY(pLayer, "p.layer")
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPuzzleLayer::VPuzzleLayer()
|
VPuzzleLayer::VPuzzleLayer(VPuzzleLayout *layout):
|
||||||
|
m_layout(layout)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -39,6 +46,12 @@ VPuzzleLayer::~VPuzzleLayer()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VPuzzleLayout* VPuzzleLayer::GetLayout()
|
||||||
|
{
|
||||||
|
return m_layout;
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
QList<VPuzzlePiece *> VPuzzleLayer::GetPieces()
|
QList<VPuzzlePiece *> VPuzzleLayer::GetPieces()
|
||||||
{
|
{
|
||||||
|
@ -48,13 +61,21 @@ QList<VPuzzlePiece *> VPuzzleLayer::GetPieces()
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VPuzzleLayer::AddPiece(VPuzzlePiece *piece)
|
void VPuzzleLayer::AddPiece(VPuzzlePiece *piece)
|
||||||
{
|
{
|
||||||
|
qCDebug(pLayer(), "piece -- %s -- added to %s", qUtf8Printable(piece->GetName()), qUtf8Printable(this->GetName()));
|
||||||
|
|
||||||
m_pieces.append(piece);
|
m_pieces.append(piece);
|
||||||
|
piece->SetLayer(this);
|
||||||
|
|
||||||
|
emit PieceAdded(piece);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VPuzzleLayer::RemovePiece(VPuzzlePiece *piece)
|
void VPuzzleLayer::RemovePiece(VPuzzlePiece *piece)
|
||||||
{
|
{
|
||||||
m_pieces.removeAll(piece);
|
m_pieces.removeAll(piece);
|
||||||
|
piece->SetLayer(nullptr);
|
||||||
|
|
||||||
|
emit PieceRemoved(piece);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -31,10 +31,13 @@
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include "vpuzzlepiece.h"
|
#include "vpuzzlepiece.h"
|
||||||
|
|
||||||
class VPuzzleLayer
|
class VPuzzleLayout;
|
||||||
|
|
||||||
|
class VPuzzleLayer : public QObject
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
VPuzzleLayer();
|
VPuzzleLayer(VPuzzleLayout *layout);
|
||||||
~VPuzzleLayer();
|
~VPuzzleLayer();
|
||||||
|
|
||||||
QList<VPuzzlePiece *> GetPieces();
|
QList<VPuzzlePiece *> GetPieces();
|
||||||
|
@ -50,10 +53,31 @@ public:
|
||||||
void SetIsVisible(bool value);
|
void SetIsVisible(bool value);
|
||||||
bool GetIsVisible() const;
|
bool GetIsVisible() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief GetLayout Returns the layout in which this layer is
|
||||||
|
* @return the layout of this layer
|
||||||
|
*/
|
||||||
|
VPuzzleLayout* GetLayout();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
/**
|
||||||
|
* @brief PieceAdded The signal is emited when a piece was added
|
||||||
|
*/
|
||||||
|
void PieceAdded(VPuzzlePiece *piece);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief PieceRemoved The signal is emited when a piece was removed
|
||||||
|
*/
|
||||||
|
void PieceRemoved(VPuzzlePiece *piece);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Q_DISABLE_COPY(VPuzzleLayer)
|
||||||
|
|
||||||
QString m_name{};
|
QString m_name{};
|
||||||
QList<VPuzzlePiece *> m_pieces{};
|
QList<VPuzzlePiece *> m_pieces{};
|
||||||
|
|
||||||
|
VPuzzleLayout *m_layout{nullptr};
|
||||||
|
|
||||||
// control
|
// control
|
||||||
bool m_isVisible{true};
|
bool m_isVisible{true};
|
||||||
|
|
||||||
|
|
|
@ -31,14 +31,17 @@
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPuzzleLayout::VPuzzleLayout() :
|
VPuzzleLayout::VPuzzleLayout() :
|
||||||
m_unplacedPiecesLayer(new VPuzzleLayer())
|
m_unplacedPiecesLayer(new VPuzzleLayer(this))
|
||||||
{
|
{
|
||||||
m_unplacedPiecesLayer->SetName(QObject::tr("Unplaced pieces"));
|
m_unplacedPiecesLayer->SetName(QObject::tr("Unplaced pieces"));
|
||||||
|
|
||||||
// create a standard default layer:
|
// create a standard default layer:
|
||||||
VPuzzleLayer *layer = new VPuzzleLayer();
|
VPuzzleLayer *layer = new VPuzzleLayer(this);
|
||||||
layer->SetName(QObject::tr("Layout"));
|
layer->SetName(QObject::tr("Layout"));
|
||||||
AddLayer(layer);
|
AddLayer(layer);
|
||||||
|
|
||||||
|
// sets the default active layer
|
||||||
|
SetFocusedLayer();
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -57,7 +60,7 @@ VPuzzleLayer* VPuzzleLayout::GetUnplacedPiecesLayer()
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPuzzleLayer* VPuzzleLayout::AddLayer()
|
VPuzzleLayer* VPuzzleLayout::AddLayer()
|
||||||
{
|
{
|
||||||
VPuzzleLayer *newLayer = new VPuzzleLayer();
|
VPuzzleLayer *newLayer = new VPuzzleLayer(this);
|
||||||
m_layers.append(newLayer);
|
m_layers.append(newLayer);
|
||||||
return newLayer;
|
return newLayer;
|
||||||
}
|
}
|
||||||
|
@ -277,3 +280,37 @@ void VPuzzleLayout::ClearSelection()
|
||||||
piece->SetIsSelected(false);
|
piece->SetIsSelected(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPuzzleLayout::SetFocusedLayer(VPuzzleLayer* focusedLayer)
|
||||||
|
{
|
||||||
|
if(focusedLayer == nullptr)
|
||||||
|
{
|
||||||
|
m_focusedLayer = m_layers.first();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_focusedLayer = focusedLayer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VPuzzleLayer* VPuzzleLayout::GetFocusedLayer()
|
||||||
|
{
|
||||||
|
return m_focusedLayer;
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPuzzleLayout::MovePieceToLayer(VPuzzlePiece* piece, VPuzzleLayer* layer)
|
||||||
|
{
|
||||||
|
VPuzzleLayer* layerBefore = piece->GetLayer();
|
||||||
|
|
||||||
|
if(layerBefore != nullptr)
|
||||||
|
{
|
||||||
|
piece->GetLayer()->RemovePiece(piece);
|
||||||
|
}
|
||||||
|
layer->AddPiece(piece);
|
||||||
|
|
||||||
|
// signal, that a piece was moved
|
||||||
|
emit PieceMovedToLayer(piece, layerBefore,layer);
|
||||||
|
}
|
||||||
|
|
|
@ -40,8 +40,9 @@ class VPuzzlePiece;
|
||||||
// is this the right place for the definition?
|
// is this the right place for the definition?
|
||||||
enum class FollowGrainline : qint8 { No = 0, Follow90 = 1, Follow180 = 2};
|
enum class FollowGrainline : qint8 { No = 0, Follow90 = 1, Follow180 = 2};
|
||||||
|
|
||||||
class VPuzzleLayout
|
class VPuzzleLayout : public QObject
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
VPuzzleLayout();
|
VPuzzleLayout();
|
||||||
virtual ~VPuzzleLayout();
|
virtual ~VPuzzleLayout();
|
||||||
|
@ -200,11 +201,43 @@ public:
|
||||||
*/
|
*/
|
||||||
void ClearSelection();
|
void ClearSelection();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief SetFocusedLayer Sets the focused layer, to which pieces are added from the carrousel via drag
|
||||||
|
* and drop
|
||||||
|
* @param focusedLayer the new active layer. If nullptr, then it sets automaticaly the first layer from m_layers
|
||||||
|
*/
|
||||||
|
void SetFocusedLayer(VPuzzleLayer* focusedLayer = nullptr);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief GetFocusedLayer Returns the focused layer, to which pieces are added from the carrousel via drag
|
||||||
|
* and drop
|
||||||
|
* @return the focused layer
|
||||||
|
*/
|
||||||
|
VPuzzleLayer* GetFocusedLayer();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief MovePieceToLayer Moves the given piece to the given layer
|
||||||
|
* @param piece the piece to move
|
||||||
|
* @param layer the layer to move the piece to
|
||||||
|
*/
|
||||||
|
void MovePieceToLayer(VPuzzlePiece* piece, VPuzzleLayer* layer);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
|
||||||
|
void PieceMovedToLayer(VPuzzlePiece *piece, VPuzzleLayer *layerBefore, VPuzzleLayer *layerAfter);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Q_DISABLE_COPY(VPuzzleLayout)
|
Q_DISABLE_COPY(VPuzzleLayout)
|
||||||
|
|
||||||
VPuzzleLayer *m_unplacedPiecesLayer;
|
VPuzzleLayer *m_unplacedPiecesLayer;
|
||||||
QList<VPuzzleLayer *> m_layers{};
|
QList<VPuzzleLayer *> m_layers{};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief m_focusedLayer pointer the the focused layer, to which pieces will be
|
||||||
|
* added via drag and drop, or if no layer is defined.
|
||||||
|
*/
|
||||||
|
VPuzzleLayer *m_focusedLayer{nullptr};
|
||||||
|
|
||||||
// format
|
// format
|
||||||
Unit m_unit{Unit::Cm};
|
Unit m_unit{Unit::Cm};
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include "vpuzzlemaingraphicsscene.h"
|
#include "vpuzzlemaingraphicsscene.h"
|
||||||
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPuzzleMainGraphicsScene::VPuzzleMainGraphicsScene(QObject *parent): QGraphicsScene(parent)
|
VPuzzleMainGraphicsScene::VPuzzleMainGraphicsScene(QObject *parent): QGraphicsScene(parent)
|
||||||
{
|
{
|
||||||
|
|
|
@ -38,6 +38,7 @@ class VPuzzleMainGraphicsScene : public QGraphicsScene
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
VPuzzleMainGraphicsScene(QObject *parent = nullptr);
|
VPuzzleMainGraphicsScene(QObject *parent = nullptr);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // VPUZZLEMAINGRAPHICSSCENE_H
|
#endif // VPUZZLEMAINGRAPHICSSCENE_H
|
||||||
|
|
|
@ -30,8 +30,10 @@
|
||||||
|
|
||||||
#include <QDragEnterEvent>
|
#include <QDragEnterEvent>
|
||||||
#include <QMimeData>
|
#include <QMimeData>
|
||||||
|
#include <QKeyEvent>
|
||||||
|
|
||||||
#include "vpuzzlemimedatapiece.h"
|
#include "vpuzzlemimedatapiece.h"
|
||||||
|
#include "vpuzzlelayer.h"
|
||||||
|
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
|
|
||||||
|
@ -41,6 +43,7 @@ Q_LOGGING_CATEGORY(pMainGraphicsView, "p.mainGraphicsView")
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPuzzleMainGraphicsView::VPuzzleMainGraphicsView(VPuzzleLayout *layout, QWidget *parent) :
|
VPuzzleMainGraphicsView::VPuzzleMainGraphicsView(VPuzzleLayout *layout, QWidget *parent) :
|
||||||
QGraphicsView(parent),
|
QGraphicsView(parent),
|
||||||
|
m_layout(layout),
|
||||||
m_graphicsPieces(QList<VPuzzleGraphicsPiece*>())
|
m_graphicsPieces(QList<VPuzzleGraphicsPiece*>())
|
||||||
{
|
{
|
||||||
m_scene = new VPuzzleMainGraphicsScene(this);
|
m_scene = new VPuzzleMainGraphicsScene(this);
|
||||||
|
@ -53,6 +56,9 @@ VPuzzleMainGraphicsView::VPuzzleMainGraphicsView(VPuzzleLayout *layout, QWidget
|
||||||
setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
||||||
|
|
||||||
setAcceptDrops(true);
|
setAcceptDrops(true);
|
||||||
|
|
||||||
|
// add the connections
|
||||||
|
connect(m_layout, &VPuzzleLayout::PieceMovedToLayer, this, &VPuzzleMainGraphicsView::on_PieceMovedToLayer);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -119,30 +125,66 @@ void VPuzzleMainGraphicsView::dropEvent(QDropEvent *event)
|
||||||
qCDebug(pMainGraphicsView(), "element dropped, %s", qUtf8Printable(piece->GetName()));
|
qCDebug(pMainGraphicsView(), "element dropped, %s", qUtf8Printable(piece->GetName()));
|
||||||
event->acceptProposedAction();
|
event->acceptProposedAction();
|
||||||
|
|
||||||
|
|
||||||
QPoint point = event->pos();
|
QPoint point = event->pos();
|
||||||
QPointF scenePos = mapToScene(point);
|
piece->SetPosition(mapToScene(point));
|
||||||
// todo take the position into account
|
|
||||||
|
|
||||||
AddPiece(piece, scenePos);
|
|
||||||
|
|
||||||
|
// change the layer of the piece
|
||||||
|
VPuzzleLayer *focusedLayer = m_layout->GetFocusedLayer();
|
||||||
|
if(focusedLayer != nullptr)
|
||||||
|
{
|
||||||
|
m_layout->MovePieceToLayer(piece, focusedLayer);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPuzzleMainGraphicsView::keyPressEvent(QKeyEvent *event)
|
||||||
|
{
|
||||||
|
if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete)
|
||||||
|
{
|
||||||
|
for(auto graphicsPiece : m_graphicsPieces)
|
||||||
|
{
|
||||||
|
VPuzzlePiece *piece = graphicsPiece->GetPiece();
|
||||||
|
|
||||||
|
if(piece->GetIsSelected())
|
||||||
|
{
|
||||||
|
m_layout->MovePieceToLayer(piece, m_layout->GetUnplacedPiecesLayer());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VPuzzleMainGraphicsView::AddPiece(VPuzzlePiece *piece, QPointF pos)
|
void VPuzzleMainGraphicsView::on_PieceMovedToLayer(VPuzzlePiece *piece, VPuzzleLayer *layerBefore, VPuzzleLayer *layerAfter)
|
||||||
{
|
{
|
||||||
VPuzzleGraphicsPiece *item = new VPuzzleGraphicsPiece(piece);
|
Q_UNUSED(layerBefore)
|
||||||
m_scene->addItem(item);
|
|
||||||
item->setSelected(true);
|
|
||||||
item->setPos(pos);
|
|
||||||
|
|
||||||
item->blockSignals(true);
|
|
||||||
piece->SetPosition(pos);
|
|
||||||
item->blockSignals(false);
|
|
||||||
|
|
||||||
|
VPuzzleGraphicsPiece *_graphicsPiece = nullptr;
|
||||||
|
for(auto graphicPiece : m_graphicsPieces)
|
||||||
|
{
|
||||||
|
if(graphicPiece->GetPiece() == piece)
|
||||||
|
{
|
||||||
|
_graphicsPiece = graphicPiece;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(layerAfter == m_layout->GetUnplacedPiecesLayer() && _graphicsPiece != nullptr)
|
||||||
|
{
|
||||||
|
scene()->removeItem(_graphicsPiece);
|
||||||
|
m_graphicsPieces.removeAll(_graphicsPiece);
|
||||||
|
}
|
||||||
|
else if(layerAfter != m_layout->GetUnplacedPiecesLayer())
|
||||||
|
{
|
||||||
|
if(_graphicsPiece == nullptr)
|
||||||
|
{
|
||||||
|
_graphicsPiece = new VPuzzleGraphicsPiece(piece);
|
||||||
|
m_graphicsPieces.append(_graphicsPiece);
|
||||||
|
}
|
||||||
|
|
||||||
|
scene()->addItem(_graphicsPiece);
|
||||||
|
_graphicsPiece->setPos(_graphicsPiece->GetPiece()->GetPosition());
|
||||||
|
_graphicsPiece->setSelected(_graphicsPiece->GetPiece()->GetIsSelected());
|
||||||
|
_graphicsPiece->update();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,14 +50,22 @@ public:
|
||||||
*/
|
*/
|
||||||
void RefreshLayout();
|
void RefreshLayout();
|
||||||
|
|
||||||
void AddPiece(VPuzzlePiece *piece, QPointF pos);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void dragEnterEvent(QDragEnterEvent *event) override;
|
void dragEnterEvent(QDragEnterEvent *event) override;
|
||||||
void dragMoveEvent(QDragMoveEvent *event) override;
|
void dragMoveEvent(QDragMoveEvent *event) override;
|
||||||
void dragLeaveEvent(QDragLeaveEvent *event) override;
|
void dragLeaveEvent(QDragLeaveEvent *event) override;
|
||||||
void dropEvent(QDropEvent *event) override;
|
void dropEvent(QDropEvent *event) override;
|
||||||
|
|
||||||
|
void keyPressEvent(QKeyEvent *event) override;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
/**
|
||||||
|
* @brief on_PieceMovedToLayer The slot is called when the given piece was moved from the given layer to the other given layer
|
||||||
|
* @param piece the piece that was moved
|
||||||
|
* @param layerBefore the layer before the move
|
||||||
|
* @param layerAfter the layer after the move
|
||||||
|
*/
|
||||||
|
void on_PieceMovedToLayer(VPuzzlePiece *piece, VPuzzleLayer *layerBefore, VPuzzleLayer *layerAfter);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Q_DISABLE_COPY(VPuzzleMainGraphicsView)
|
Q_DISABLE_COPY(VPuzzleMainGraphicsView)
|
||||||
|
@ -65,6 +73,8 @@ private:
|
||||||
VPuzzleMainGraphicsScene *m_scene{nullptr};
|
VPuzzleMainGraphicsScene *m_scene{nullptr};
|
||||||
|
|
||||||
VPuzzleGraphicsLayout *m_graphicsLayout{nullptr};
|
VPuzzleGraphicsLayout *m_graphicsLayout{nullptr};
|
||||||
|
VPuzzleLayout *m_layout{nullptr};
|
||||||
|
|
||||||
QList<VPuzzleGraphicsPiece*> m_graphicsPieces;
|
QList<VPuzzleGraphicsPiece*> m_graphicsPieces;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -27,6 +27,12 @@
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
#include "vpuzzlepiece.h"
|
#include "vpuzzlepiece.h"
|
||||||
|
|
||||||
|
#include "vpuzzlelayer.h"
|
||||||
|
|
||||||
|
#include <QLoggingCategory>
|
||||||
|
|
||||||
|
Q_LOGGING_CATEGORY(pPiece, "p.piece")
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPuzzlePiece::VPuzzlePiece()
|
VPuzzlePiece::VPuzzlePiece()
|
||||||
{
|
{
|
||||||
|
@ -200,3 +206,18 @@ QVector<QPointF> VPuzzlePiece::GetGrainline()
|
||||||
return m_grainline;
|
return m_grainline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VPuzzleLayer* VPuzzlePiece::GetLayer()
|
||||||
|
{
|
||||||
|
return m_layer;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPuzzlePiece::SetLayer(VPuzzleLayer* layer)
|
||||||
|
{
|
||||||
|
if(layer != m_layer)
|
||||||
|
{
|
||||||
|
m_layer = layer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -33,6 +33,8 @@
|
||||||
#include <QPoint>
|
#include <QPoint>
|
||||||
#include <QTransform>
|
#include <QTransform>
|
||||||
|
|
||||||
|
class VPuzzleLayer;
|
||||||
|
|
||||||
class VPuzzlePiece : public QObject
|
class VPuzzlePiece : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -135,18 +137,6 @@ public:
|
||||||
*/
|
*/
|
||||||
qreal GetRotation();
|
qreal GetRotation();
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief SetIsSelected Sets wether the piece is selected
|
|
||||||
* @param value true if the piece is selected
|
|
||||||
*/
|
|
||||||
void SetIsSelected(bool value);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief GetIsSelected Returns wether the piece is selected
|
|
||||||
* @return true if the piece is selected
|
|
||||||
*/
|
|
||||||
bool GetIsSelected();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief SetIsGrainlineEnabled Wether the piece has a grainline or not
|
* @brief SetIsGrainlineEnabled Wether the piece has a grainline or not
|
||||||
* @param value true or false
|
* @param value true or false
|
||||||
|
@ -184,6 +174,30 @@ public:
|
||||||
QVector<QPointF> GetGrainline();
|
QVector<QPointF> GetGrainline();
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief SetIsSelected Sets wether the piece is selected
|
||||||
|
* @param value true if the piece is selected
|
||||||
|
*/
|
||||||
|
void SetIsSelected(bool value);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief GetIsSelected Returns wether the piece is selected. It emit the signal SelectionChanged
|
||||||
|
* @return true if the piece is selected
|
||||||
|
*/
|
||||||
|
bool GetIsSelected();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief GetLayer Returns the layer in which the piece is.
|
||||||
|
* @return layer of the piece
|
||||||
|
*/
|
||||||
|
VPuzzleLayer* GetLayer();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief SetLayer Sets the layer of the piece to the given layer
|
||||||
|
* @param layer
|
||||||
|
*/
|
||||||
|
void SetLayer(VPuzzleLayer* layer);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
/**
|
/**
|
||||||
* @brief SelectionChanged emited when the selection of the piece was
|
* @brief SelectionChanged emited when the selection of the piece was
|
||||||
|
@ -209,12 +223,8 @@ signals:
|
||||||
*/
|
*/
|
||||||
void PropertiesChanged();
|
void PropertiesChanged();
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief LayerChanged emited when the piece's layer was changed.
|
|
||||||
*/
|
|
||||||
void LayerChanged();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Q_DISABLE_COPY(VPuzzlePiece)
|
||||||
QUuid m_uuid{QUuid()};
|
QUuid m_uuid{QUuid()};
|
||||||
QString m_name{QString()};
|
QString m_name{QString()};
|
||||||
QVector<QPointF> m_cuttingLine{QVector<QPointF>()};
|
QVector<QPointF> m_cuttingLine{QVector<QPointF>()};
|
||||||
|
@ -228,7 +238,9 @@ private:
|
||||||
|
|
||||||
bool m_showSeamline{true};
|
bool m_showSeamline{true};
|
||||||
bool m_mirrorPiece{false};
|
bool m_mirrorPiece{false};
|
||||||
|
|
||||||
bool m_isSelected{false};
|
bool m_isSelected{false};
|
||||||
|
VPuzzleLayer *m_layer{nullptr};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // VPUZZLEPIECE_H
|
#endif // VPUZZLEPIECE_H
|
||||||
|
|
Loading…
Reference in New Issue
Block a user