|
@@ -1,4 +1,4 @@
|
|
|
-#include "GraphicsView.hpp"
|
|
|
+#include "GraphicsView.hpp"
|
|
|
|
|
|
#include "BasicGraphicsScene.hpp"
|
|
|
#include "ConnectionGraphicsObject.hpp"
|
|
@@ -27,12 +27,12 @@ using QtNodes::BasicGraphicsScene;
|
|
|
using QtNodes::GraphicsView;
|
|
|
|
|
|
GraphicsView::GraphicsView(QWidget *parent)
|
|
|
- : QGraphicsView(parent)
|
|
|
- , _clearSelectionAction(Q_NULLPTR)
|
|
|
- , _deleteSelectionAction(Q_NULLPTR)
|
|
|
- , _duplicateSelectionAction(Q_NULLPTR)
|
|
|
- , _copySelectionAction(Q_NULLPTR)
|
|
|
- , _pasteAction(Q_NULLPTR)
|
|
|
+ : QGraphicsView(parent),
|
|
|
+ _clearSelectionAction(Q_NULLPTR),
|
|
|
+ _deleteSelectionAction(Q_NULLPTR),
|
|
|
+ _duplicateSelectionAction(Q_NULLPTR),
|
|
|
+ _copySelectionAction(Q_NULLPTR),
|
|
|
+ _pasteAction(Q_NULLPTR)
|
|
|
{
|
|
|
setDragMode(QGraphicsView::ScrollHandDrag);
|
|
|
setRenderHint(QPainter::Antialiasing);
|
|
@@ -57,8 +57,7 @@ GraphicsView::GraphicsView(QWidget *parent)
|
|
|
setSceneRect(-maxSize, -maxSize, (maxSize * 2), (maxSize * 2));
|
|
|
}
|
|
|
|
|
|
-GraphicsView::GraphicsView(BasicGraphicsScene *scene, QWidget *parent)
|
|
|
- : GraphicsView(parent)
|
|
|
+GraphicsView::GraphicsView(BasicGraphicsScene *scene, QWidget *parent) : GraphicsView(parent)
|
|
|
{
|
|
|
setScene(scene);
|
|
|
}
|
|
@@ -93,10 +92,7 @@ void GraphicsView::setScene(BasicGraphicsScene *scene)
|
|
|
_deleteSelectionAction = new QAction(QStringLiteral("Delete Selection"), this);
|
|
|
_deleteSelectionAction->setShortcutContext(Qt::ShortcutContext::WidgetShortcut);
|
|
|
_deleteSelectionAction->setShortcut(QKeySequence(QKeySequence::Delete));
|
|
|
- connect(_deleteSelectionAction,
|
|
|
- &QAction::triggered,
|
|
|
- this,
|
|
|
- &GraphicsView::onDeleteSelectedObjects);
|
|
|
+ connect(_deleteSelectionAction, &QAction::triggered, this, &GraphicsView::onDeleteSelectedObjects);
|
|
|
|
|
|
addAction(_deleteSelectionAction);
|
|
|
}
|
|
@@ -106,10 +102,7 @@ void GraphicsView::setScene(BasicGraphicsScene *scene)
|
|
|
_duplicateSelectionAction = new QAction(QStringLiteral("Duplicate Selection"), this);
|
|
|
_duplicateSelectionAction->setShortcutContext(Qt::ShortcutContext::WidgetShortcut);
|
|
|
_duplicateSelectionAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D));
|
|
|
- connect(_duplicateSelectionAction,
|
|
|
- &QAction::triggered,
|
|
|
- this,
|
|
|
- &GraphicsView::onDuplicateSelectedObjects);
|
|
|
+ connect(_duplicateSelectionAction, &QAction::triggered, this, &GraphicsView::onDuplicateSelectedObjects);
|
|
|
|
|
|
addAction(_duplicateSelectionAction);
|
|
|
}
|
|
@@ -119,10 +112,7 @@ void GraphicsView::setScene(BasicGraphicsScene *scene)
|
|
|
_copySelectionAction = new QAction(QStringLiteral("Copy Selection"), this);
|
|
|
_copySelectionAction->setShortcutContext(Qt::ShortcutContext::WidgetShortcut);
|
|
|
_copySelectionAction->setShortcut(QKeySequence(QKeySequence::Copy));
|
|
|
- connect(_copySelectionAction,
|
|
|
- &QAction::triggered,
|
|
|
- this,
|
|
|
- &GraphicsView::onCopySelectedObjects);
|
|
|
+ connect(_copySelectionAction, &QAction::triggered, this, &GraphicsView::onCopySelectedObjects);
|
|
|
|
|
|
addAction(_copySelectionAction);
|
|
|
}
|
|
@@ -206,7 +196,7 @@ void GraphicsView::setScaleRange(double minimum, double maximum)
|
|
|
minimum = std::max(0.0, minimum);
|
|
|
maximum = std::max(0.0, maximum);
|
|
|
|
|
|
- _scaleRange = {minimum, maximum};
|
|
|
+ _scaleRange = { minimum, maximum };
|
|
|
|
|
|
setupScale(transform().m11());
|
|
|
}
|
|
@@ -218,7 +208,7 @@ void GraphicsView::setScaleRange(ScaleRange range)
|
|
|
|
|
|
void GraphicsView::scaleUp()
|
|
|
{
|
|
|
- double const step = 1.2;
|
|
|
+ double const step = 1.2;
|
|
|
double const factor = std::pow(step, 1.0);
|
|
|
|
|
|
if (_scaleRange.maximum > 0) {
|
|
@@ -236,7 +226,7 @@ void GraphicsView::scaleUp()
|
|
|
|
|
|
void GraphicsView::scaleDown()
|
|
|
{
|
|
|
- double const step = 1.2;
|
|
|
+ double const step = 1.2;
|
|
|
double const factor = std::pow(step, -1.0);
|
|
|
|
|
|
if (_scaleRange.minimum > 0) {
|
|
@@ -346,13 +336,13 @@ void GraphicsView::drawBackground(QPainter *painter, const QRectF &r)
|
|
|
|
|
|
auto drawGrid = [&](double gridStep) {
|
|
|
QRect windowRect = rect();
|
|
|
- QPointF tl = mapToScene(windowRect.topLeft());
|
|
|
- QPointF br = mapToScene(windowRect.bottomRight());
|
|
|
+ QPointF tl = mapToScene(windowRect.topLeft());
|
|
|
+ QPointF br = mapToScene(windowRect.bottomRight());
|
|
|
|
|
|
- double left = std::floor(tl.x() / gridStep - 0.5);
|
|
|
- double right = std::floor(br.x() / gridStep + 1.0);
|
|
|
+ double left = std::floor(tl.x() / gridStep - 0.5);
|
|
|
+ double right = std::floor(br.x() / gridStep + 1.0);
|
|
|
double bottom = std::floor(tl.y() / gridStep - 0.5);
|
|
|
- double top = std::floor(br.y() / gridStep + 1.0);
|
|
|
+ double top = std::floor(br.y() / gridStep + 1.0);
|
|
|
|
|
|
// vertical lines
|
|
|
for (int xi = int(left); xi <= int(right); ++xi) {
|