diff options
Diffstat (limited to 'examples/widgets/graphicsview/elasticnodes')
6 files changed, 13 insertions, 18 deletions
diff --git a/examples/widgets/graphicsview/elasticnodes/edge.cpp b/examples/widgets/graphicsview/elasticnodes/edge.cpp index aec12b4225..9ca8b37f3d 100644 --- a/examples/widgets/graphicsview/elasticnodes/edge.cpp +++ b/examples/widgets/graphicsview/elasticnodes/edge.cpp @@ -51,16 +51,14 @@ #include "edge.h" #include "node.h" -#include <qmath.h> #include <QPainter> +#include <QtMath> //! [0] Edge::Edge(Node *sourceNode, Node *destNode) - : arrowSize(10) + : source(sourceNode), dest(destNode) { - setAcceptedMouseButtons(0); - source = sourceNode; - dest = destNode; + setAcceptedMouseButtons(Qt::NoButton); source->addEdge(this); dest->addEdge(this); adjust(); diff --git a/examples/widgets/graphicsview/elasticnodes/edge.h b/examples/widgets/graphicsview/elasticnodes/edge.h index 19072b8b33..048d3ffd02 100644 --- a/examples/widgets/graphicsview/elasticnodes/edge.h +++ b/examples/widgets/graphicsview/elasticnodes/edge.h @@ -78,7 +78,7 @@ private: QPointF sourcePoint; QPointF destPoint; - qreal arrowSize; + qreal arrowSize = 10; }; //! [0] diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp index 6b817b2a21..a067f82ad7 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp @@ -59,7 +59,7 @@ //! [0] GraphWidget::GraphWidget(QWidget *parent) - : QGraphicsView(parent), timerId(0) + : QGraphicsView(parent) { QGraphicsScene *scene = new QGraphicsScene(this); scene->setItemIndexMethod(QGraphicsScene::NoIndex); @@ -163,7 +163,7 @@ void GraphWidget::timerEvent(QTimerEvent *event) { Q_UNUSED(event); - QList<Node *> nodes; + QVector<Node *> nodes; const QList<QGraphicsItem *> items = scene()->items(); for (QGraphicsItem *item : items) { if (Node *node = qgraphicsitem_cast<Node *>(item)) @@ -190,7 +190,7 @@ void GraphWidget::timerEvent(QTimerEvent *event) //! [5] void GraphWidget::wheelEvent(QWheelEvent *event) { - scaleView(pow((double)2, -event->delta() / 240.0)); + scaleView(pow(2., -event->angleDelta().y() / 240.0)); } //! [5] #endif diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.h b/examples/widgets/graphicsview/elasticnodes/graphwidget.h index 5ed6aed452..6d241fa9f1 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.h +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.h @@ -61,7 +61,7 @@ class GraphWidget : public QGraphicsView Q_OBJECT public: - GraphWidget(QWidget *parent = 0); + GraphWidget(QWidget *parent = nullptr); void itemMoved(); @@ -81,7 +81,7 @@ protected: void scaleView(qreal scaleFactor); private: - int timerId; + int timerId = 0; Node *centerNode; }; //! [0] diff --git a/examples/widgets/graphicsview/elasticnodes/node.cpp b/examples/widgets/graphicsview/elasticnodes/node.cpp index 8d44a167fa..a67e21c4b3 100644 --- a/examples/widgets/graphicsview/elasticnodes/node.cpp +++ b/examples/widgets/graphicsview/elasticnodes/node.cpp @@ -75,7 +75,7 @@ void Node::addEdge(Edge *edge) edge->adjust(); } -QList<Edge *> Node::edges() const +QVector<Edge *> Node::edges() const { return edgeList; } diff --git a/examples/widgets/graphicsview/elasticnodes/node.h b/examples/widgets/graphicsview/elasticnodes/node.h index 43ea1fb24b..b160ff37cc 100644 --- a/examples/widgets/graphicsview/elasticnodes/node.h +++ b/examples/widgets/graphicsview/elasticnodes/node.h @@ -52,13 +52,10 @@ #define NODE_H #include <QGraphicsItem> -#include <QList> +#include <QVector> class Edge; class GraphWidget; -QT_BEGIN_NAMESPACE -class QGraphicsSceneMouseEvent; -QT_END_NAMESPACE //! [0] class Node : public QGraphicsItem @@ -67,7 +64,7 @@ public: Node(GraphWidget *graphWidget); void addEdge(Edge *edge); - QList<Edge *> edges() const; + QVector<Edge *> edges() const; enum { Type = UserType + 1 }; int type() const override { return Type; } @@ -86,7 +83,7 @@ protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: - QList<Edge *> edgeList; + QVector<Edge *> edgeList; QPointF newPos; GraphWidget *graph; }; |