Piece carrousel
This commit is contained in:
parent
ed6cc7f5d9
commit
95101b6ac3
|
@ -32,20 +32,21 @@
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
PuzzleMainWindow::PuzzleMainWindow(QWidget *parent) :
|
PuzzleMainWindow::PuzzleMainWindow(QWidget *parent) :
|
||||||
QMainWindow(parent),
|
QMainWindow(parent),
|
||||||
ui(new Ui::PuzzleMainWindow)
|
ui(new Ui::PuzzleMainWindow),
|
||||||
|
pieceCarrousel(new VPieceCarrousel)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
InitMenuBar();
|
InitMenuBar();
|
||||||
|
InitProperties();
|
||||||
InitPropertyTabs();
|
InitPieceCarrousel();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
PuzzleMainWindow::~PuzzleMainWindow()
|
PuzzleMainWindow::~PuzzleMainWindow()
|
||||||
{
|
{
|
||||||
delete ui;
|
delete ui;
|
||||||
|
delete pieceCarrousel;
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -58,7 +59,7 @@ bool PuzzleMainWindow::LoadFile(const QString &path)
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void PuzzleMainWindow::InitMenuBar()
|
void PuzzleMainWindow::InitMenuBar()
|
||||||
{
|
{
|
||||||
// connects the actions for the file menu
|
// -------------------- connects the actions for the file menu
|
||||||
connect(ui->actionNew, &QAction::triggered, this, &PuzzleMainWindow::New);
|
connect(ui->actionNew, &QAction::triggered, this, &PuzzleMainWindow::New);
|
||||||
connect(ui->actionOpen, &QAction::triggered, this, &PuzzleMainWindow::Open);
|
connect(ui->actionOpen, &QAction::triggered, this, &PuzzleMainWindow::Open);
|
||||||
connect(ui->actionSave, &QAction::triggered, this, &PuzzleMainWindow::Save);
|
connect(ui->actionSave, &QAction::triggered, this, &PuzzleMainWindow::Save);
|
||||||
|
@ -66,13 +67,17 @@ void PuzzleMainWindow::InitMenuBar()
|
||||||
connect(ui->actionImportRawLayout, &QAction::triggered, this, &PuzzleMainWindow::ImportRawLayout);
|
connect(ui->actionImportRawLayout, &QAction::triggered, this, &PuzzleMainWindow::ImportRawLayout);
|
||||||
connect(ui->actionExit, &QAction::triggered, this, &PuzzleMainWindow::close);
|
connect(ui->actionExit, &QAction::triggered, this, &PuzzleMainWindow::close);
|
||||||
|
|
||||||
// connects the actions for the edit menu
|
// -------------------- connects the actions for the edit menu
|
||||||
// TODO : initialise the undo / redo
|
// TODO : initialise the undo / redo
|
||||||
|
|
||||||
// connects the actions for the windows menu
|
// -------------------- connects the actions for the windows menu
|
||||||
// TODO : initialise the entries for the different windows
|
// TODO : initialise the entries for the different windows
|
||||||
connect(ui->actionCloseLayout, &QAction::triggered, this, &PuzzleMainWindow::CloseLayout);
|
connect(ui->actionCloseLayout, &QAction::triggered, this, &PuzzleMainWindow::CloseLayout);
|
||||||
|
|
||||||
|
// Add dock properties action
|
||||||
|
QAction* actionDockWidgetToolOptions = ui->dockWidgetProperties->toggleViewAction();
|
||||||
|
ui->menuWindows->addAction(actionDockWidgetToolOptions);
|
||||||
|
|
||||||
// connects the action for the Help Menu
|
// connects the action for the Help Menu
|
||||||
connect(ui->actionAboutQt, &QAction::triggered, this, &PuzzleMainWindow::AboutQt);
|
connect(ui->actionAboutQt, &QAction::triggered, this, &PuzzleMainWindow::AboutQt);
|
||||||
connect(ui->actionAboutPuzzle, &QAction::triggered, this, &PuzzleMainWindow::AboutPuzzle);
|
connect(ui->actionAboutPuzzle, &QAction::triggered, this, &PuzzleMainWindow::AboutPuzzle);
|
||||||
|
@ -80,7 +85,7 @@ void PuzzleMainWindow::InitMenuBar()
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void PuzzleMainWindow::InitPropertyTabs()
|
void PuzzleMainWindow::InitProperties()
|
||||||
{
|
{
|
||||||
InitPropertyTabCurrentPiece();
|
InitPropertyTabCurrentPiece();
|
||||||
InitPropertyTabLayout();
|
InitPropertyTabLayout();
|
||||||
|
@ -202,6 +207,18 @@ void PuzzleMainWindow::InitPropertyTabLayers()
|
||||||
ui->tabWidgetProperties->removeTab(3); // remove layers
|
ui->tabWidgetProperties->removeTab(3); // remove layers
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void PuzzleMainWindow::InitPieceCarrousel()
|
||||||
|
{
|
||||||
|
ui->dockWidgetPieceCarrousel->setWidget(pieceCarrousel);
|
||||||
|
|
||||||
|
connect(ui->dockWidgetPieceCarrousel, QOverload<Qt::DockWidgetArea>::of(&QDockWidget::dockLocationChanged), this,
|
||||||
|
&PuzzleMainWindow::PieceCarrouselLocationChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void PuzzleMainWindow::New()
|
void PuzzleMainWindow::New()
|
||||||
{
|
{
|
||||||
|
@ -525,3 +542,21 @@ void PuzzleMainWindow::CurrentPiecePositionChanged()
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void PuzzleMainWindow::PieceCarrouselLocationChanged(Qt::DockWidgetArea area)
|
||||||
|
{
|
||||||
|
if(area == Qt::BottomDockWidgetArea || area == Qt::TopDockWidgetArea)
|
||||||
|
{
|
||||||
|
pieceCarrousel->setOrientation(Qt::Horizontal);
|
||||||
|
ui->dockWidgetPieceCarrousel->setMaximumHeight(208);
|
||||||
|
ui->dockWidgetPieceCarrousel->setMaximumWidth(10000);
|
||||||
|
}
|
||||||
|
else if (area == Qt::LeftDockWidgetArea || area == Qt::RightDockWidgetArea)
|
||||||
|
{
|
||||||
|
pieceCarrousel->setOrientation(Qt::Vertical);
|
||||||
|
ui->dockWidgetPieceCarrousel->setMaximumHeight(10000);
|
||||||
|
ui->dockWidgetPieceCarrousel->setMaximumWidth(160);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
#include "vpiececarrousel.h"
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class PuzzleMainWindow;
|
class PuzzleMainWindow;
|
||||||
|
@ -50,14 +51,15 @@ public:
|
||||||
private:
|
private:
|
||||||
Q_DISABLE_COPY(PuzzleMainWindow)
|
Q_DISABLE_COPY(PuzzleMainWindow)
|
||||||
Ui::PuzzleMainWindow *ui;
|
Ui::PuzzleMainWindow *ui;
|
||||||
|
VPieceCarrousel *pieceCarrousel;
|
||||||
|
|
||||||
void InitMenuBar();
|
void InitMenuBar();
|
||||||
void InitPropertyTabs();
|
void InitProperties();
|
||||||
void InitPropertyTabCurrentPiece();
|
void InitPropertyTabCurrentPiece();
|
||||||
void InitPropertyTabLayout();
|
void InitPropertyTabLayout();
|
||||||
void InitPropertyTabTiles();
|
void InitPropertyTabTiles();
|
||||||
void InitPropertyTabLayers();
|
void InitPropertyTabLayers();
|
||||||
|
void InitPieceCarrousel();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void New();
|
void New();
|
||||||
|
@ -88,6 +90,8 @@ private slots:
|
||||||
void CurrentPieceAngleChanged(double value);
|
void CurrentPieceAngleChanged(double value);
|
||||||
void CurrentPiecePositionChanged();
|
void CurrentPiecePositionChanged();
|
||||||
|
|
||||||
|
void PieceCarrouselLocationChanged(Qt::DockWidgetArea area);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PUZZLEMAINWINDOW_H
|
#endif // PUZZLEMAINWINDOW_H
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
128
src/app/puzzle/vpiececarrousel.cpp
Normal file
128
src/app/puzzle/vpiececarrousel.cpp
Normal file
|
@ -0,0 +1,128 @@
|
||||||
|
#include "vpiececarrousel.h"
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QMessageBox>
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VPieceCarrousel::VPieceCarrousel(QWidget *parent) :
|
||||||
|
QWidget(parent),
|
||||||
|
comboBoxLayer(new QComboBox),
|
||||||
|
mainScrollArea(new QScrollArea(this)),
|
||||||
|
layers(QList<QWidget *>())
|
||||||
|
{
|
||||||
|
|
||||||
|
QVBoxLayout *mainLayout = new QVBoxLayout();
|
||||||
|
setLayout(mainLayout);
|
||||||
|
|
||||||
|
setMinimumSize(140,140);
|
||||||
|
|
||||||
|
mainLayout->addWidget(comboBoxLayer);
|
||||||
|
comboBoxLayer->addItem(tr("Unplaced pieces"));
|
||||||
|
comboBoxLayer->addItem(tr("Layout"));
|
||||||
|
comboBoxLayer->setCurrentIndex(0);
|
||||||
|
connect(comboBoxLayer, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||||
|
&VPieceCarrousel::ActiveLayerChanged);
|
||||||
|
|
||||||
|
QWidget *widget = new QWidget();
|
||||||
|
QVBoxLayout *mainScrollAreaLayout = new QVBoxLayout();
|
||||||
|
mainScrollAreaLayout->setMargin(0);
|
||||||
|
widget->setLayout(mainScrollAreaLayout);
|
||||||
|
mainScrollArea->setWidget(widget);
|
||||||
|
|
||||||
|
mainLayout->addWidget(mainScrollArea);
|
||||||
|
// mainScrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
|
||||||
|
mainScrollArea->setWidgetResizable( true );
|
||||||
|
|
||||||
|
|
||||||
|
// this code is for test purpuses, it needs to be updated when we have proper data!
|
||||||
|
|
||||||
|
QWidget *unplacedPieces = new QWidget();
|
||||||
|
QVBoxLayout *unplacedPiecesLayout = new QVBoxLayout();
|
||||||
|
unplacedPiecesLayout->setMargin(0);
|
||||||
|
unplacedPieces->setLayout(unplacedPiecesLayout);
|
||||||
|
for(int i=0; i<=10; ++i)
|
||||||
|
{
|
||||||
|
QLabel *myLabel = new QLabel();
|
||||||
|
myLabel->setText(QString ("Element A.%1").arg(i));
|
||||||
|
myLabel->setFixedSize(120,120);
|
||||||
|
myLabel->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
|
||||||
|
if(i%2 ==0)
|
||||||
|
{
|
||||||
|
myLabel->setStyleSheet("background-color:white");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
myLabel->setStyleSheet("background-color:red");
|
||||||
|
}
|
||||||
|
unplacedPiecesLayout->addWidget(myLabel);
|
||||||
|
}
|
||||||
|
mainScrollAreaLayout->addWidget(unplacedPieces);
|
||||||
|
layers.append(unplacedPieces);
|
||||||
|
|
||||||
|
QWidget *layoutPieces = new QWidget();
|
||||||
|
QVBoxLayout *layoutPiecesLayout = new QVBoxLayout();
|
||||||
|
layoutPiecesLayout->setMargin(0);
|
||||||
|
layoutPieces->setLayout(layoutPiecesLayout);
|
||||||
|
for(int i=0; i<=5; ++i)
|
||||||
|
{
|
||||||
|
QLabel *myLabel = new QLabel();
|
||||||
|
myLabel->setText(QString ("Element B.%1").arg(i));
|
||||||
|
myLabel->setFixedSize(120,120);
|
||||||
|
myLabel->sizePolicy();
|
||||||
|
myLabel->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
|
||||||
|
myLabel->setStyleSheet("background-color:cornflowerblue");
|
||||||
|
layoutPiecesLayout->addWidget(myLabel);
|
||||||
|
}
|
||||||
|
mainScrollAreaLayout->addWidget(layoutPieces);
|
||||||
|
layers.append(layoutPieces);
|
||||||
|
|
||||||
|
QSpacerItem *spacer = new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||||
|
mainScrollAreaLayout->addSpacerItem(spacer);
|
||||||
|
|
||||||
|
// -------------------- init the layers combobox ---------------------
|
||||||
|
ActiveLayerChanged(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VPieceCarrousel::~VPieceCarrousel()
|
||||||
|
{
|
||||||
|
delete comboBoxLayer;
|
||||||
|
delete mainScrollArea;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPieceCarrousel::ActiveLayerChanged(int index)
|
||||||
|
{
|
||||||
|
int j=0;
|
||||||
|
for (QWidget *widget: layers) {
|
||||||
|
widget->setVisible(j == index);
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VPieceCarrousel::setOrientation(Qt::Orientation orientation)
|
||||||
|
{
|
||||||
|
QBoxLayout::Direction direction = QBoxLayout::LeftToRight;
|
||||||
|
|
||||||
|
if(orientation == Qt::Horizontal)
|
||||||
|
{
|
||||||
|
comboBoxLayer->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
||||||
|
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
|
||||||
|
}
|
||||||
|
else // Qt::Vertical
|
||||||
|
{
|
||||||
|
direction = QBoxLayout::TopToBottom;
|
||||||
|
comboBoxLayer->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||||
|
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
|
||||||
|
}
|
||||||
|
|
||||||
|
QBoxLayout* mainScrollAreaLayout = qobject_cast<QBoxLayout*>(mainScrollArea->widget()->layout());
|
||||||
|
mainScrollAreaLayout->setDirection(direction);
|
||||||
|
|
||||||
|
for (QWidget *widget: layers) {
|
||||||
|
QBoxLayout* layerLayout = qobject_cast<QBoxLayout*>(widget->layout());
|
||||||
|
layerLayout->setDirection(direction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
31
src/app/puzzle/vpiececarrousel.h
Normal file
31
src/app/puzzle/vpiececarrousel.h
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
#ifndef VPIECECARROUSEL_H
|
||||||
|
#define VPIECECARROUSEL_H
|
||||||
|
|
||||||
|
#include <QWidget>
|
||||||
|
#include <QComboBox>
|
||||||
|
#include <QScrollArea>
|
||||||
|
|
||||||
|
class VPieceCarrousel : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit VPieceCarrousel(QWidget *parent = nullptr);
|
||||||
|
virtual ~VPieceCarrousel();
|
||||||
|
|
||||||
|
void setOrientation(Qt::Orientation orientation);
|
||||||
|
signals:
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
|
||||||
|
private:
|
||||||
|
QComboBox *comboBoxLayer;
|
||||||
|
QScrollArea *mainScrollArea;
|
||||||
|
QList<QWidget *> layers;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void ActiveLayerChanged(int index);
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // VPIECECARROUSEL_H
|
Loading…
Reference in New Issue
Block a user