feat: zoom and pan in networkView

CMakeLists.txt

@@ -18,8 +18,9 @@ qt_standard_project_setup()
 qt_add_executable(${AppExec}
     src/gui/main.cpp
     src/gui/Interface.cpp
-    src/gui/Viewport.cpp
+    src/gui/viewport/Viewport.cpp
-    src/gui/NetworkView.cpp
+    src/gui/network/NetworkView.cpp
+    src/gui/network/NetworkGraphicsScene.cpp
 )
 
 target_link_libraries(${AppExec} PRIVATE Qt6::Core Qt6::Widgets)

src/gui/Interface.cpp

@@ -1,6 +1,6 @@
 #include "gui/Interface.h"
-#include "gui/Viewport.h"
+#include "gui/viewport/Viewport.h"
-#include "gui/NetworkView.h"
+#include "gui/network/NetworkView.h"
 #include <qpushbutton.h>
 #include <qsplitter.h>
 
@@ -16,6 +16,7 @@ EnzoUI::EnzoUI()
 
     Viewport* viewport = new Viewport();
     NetworkView* networkView = new NetworkView(this);
+    networkView->setMinimumWidth(400);
 
     viewportSplitter_ = new QSplitter(this);
 

src/gui/NetworkView.cpp

@@ -1,19 +0,0 @@
-#include "gui/NetworkView.h"
-#include <QGraphicsItem>
-#include <iostream>
-
-NetworkView::NetworkView(QWidget *parent)
-: QGraphicsView(parent) 
-{
-    QGraphicsScene *scene = new QGraphicsScene(this);
-    setScene(scene);
-
-    QPen greenPen = QPen(Qt::green);
-    greenPen.setWidth(6);
-
-
-    auto* rect1 = scene->addRect(50, 50, 100, 100, greenPen);
-    rect1->setFlag(QGraphicsItem::ItemIsMovable);
-
-}
-

src/gui/NetworkView.h

@@ -1,12 +0,0 @@
-#pragma once
-#include <qwidget.h>
-#include <QGraphicsView>
-
-class NetworkView
-: public QGraphicsView
-{
-public:
-    NetworkView(QWidget *parent = nullptr);
-private:
-
-};

src/gui/network/NetworkGraphicsScene.cpp

@@ -0,0 +1,28 @@
+#include "gui/network/NetworkGraphicsScene.h"
+#include <QGraphicsScene>
+#include <QGraphicsSceneWheelEvent>
+#include <iostream>
+#include <qgraphicsview.h>
+
+NetworkGraphicsScene::NetworkGraphicsScene(QGraphicsView *parent)
+: QGraphicsScene() 
+{
+    parent_ = parent;
+}
+
+void NetworkGraphicsScene::wheelEvent(QGraphicsSceneWheelEvent *wheelEvent)
+{
+    std::cout << "delta: " << wheelEvent->delta() << "\n";
+    int delta = wheelEvent->delta();
+    if(delta > 0)
+    {
+        parent_->scale(1.1, 1.1);
+    }
+    else if(delta < 0)
+    {
+        parent_->scale(0.9, 0.9);
+    }
+    wheelEvent->accept();
+}
+
+

src/gui/network/NetworkGraphicsScene.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <QGraphicsScene>
+
+class NetworkGraphicsScene
+: public QGraphicsScene
+{
+public:
+    NetworkGraphicsScene(QGraphicsView *parent = nullptr);
+private:
+    QGraphicsView* parent_;
+protected:
+    void wheelEvent(QGraphicsSceneWheelEvent *wheelEvent) override;
+
+};

src/gui/network/NetworkView.cpp

@@ -0,0 +1,71 @@
+#include "gui/network/NetworkView.h"
+#include <QGraphicsItem>
+#include "gui/network/NetworkGraphicsScene.h"
+#include <iostream>
+#include <QMouseEvent>
+#include <QScrollBar>
+
+NetworkView::NetworkView(QWidget *parent)
+: QGraphicsView(parent) 
+{
+    QGraphicsScene *scene = new NetworkGraphicsScene(this);
+    setScene(scene);
+
+    QPen greenPen = QPen(Qt::green);
+    greenPen.setWidth(6);
+
+
+    auto* rect1 = scene->addRect(50, 50, 100, 100, greenPen);
+    rect1->setFlag(QGraphicsItem::ItemIsMovable);
+
+    auto* rect2 = scene->addRect(80, 120, 100, 100, greenPen);
+    rect2->setFlag(QGraphicsItem::ItemIsMovable);
+
+}
+
+
+void NetworkView::mousePressEvent(QMouseEvent *event)
+{
+    if(
+        event->button() & Qt::MiddleButton
+    )
+    {
+        panStartPos = event->pos();
+        event->accept();
+        return;
+    }
+
+    QGraphicsView::mousePressEvent(event);
+}
+
+// void NetworkView::mouseReleaseEvent(QMouseEvent *event)
+// {
+//     if(
+//         event->button() & Qt::MiddleButton
+//     )
+//     {
+//         panStartPos = QPointF(0,0);
+//     }
+// }
+
+void NetworkView::mouseMoveEvent(QMouseEvent *mouseEvent)
+{
+
+    if( mouseEvent->buttons() & Qt::MiddleButton)
+    {
+        QPointF pos = mouseEvent->pos();
+        QPointF delta = pos-panStartPos;
+        std::cout << "pos: " << mouseEvent->pos().x() << " " << mouseEvent->pos().y() << "\n";
+        std::cout << "delta: " << delta.x() << " " << delta.y() << "\n";
+
+        float speed = 1.0f;
+        setSceneRect(sceneRect().translated(-delta.x()*speed, -delta.y()*speed));
+        panStartPos = mouseEvent->pos();
+        mouseEvent->accept();
+        return;
+    }
+
+    QGraphicsView::mouseMoveEvent(mouseEvent);
+    
+}
+

src/gui/network/NetworkView.h

@@ -0,0 +1,18 @@
+#pragma once
+#include <qwidget.h>
+#include <QGraphicsView>
+
+class NetworkView
+: public QGraphicsView
+{
+public:
+    NetworkView(QWidget *parent = nullptr);
+private:
+    QPointF panStartPos;
+
+protected:
+    void mouseMoveEvent(QMouseEvent *mouseEvent) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    // void mouseReleaseEvent(QMouseEvent *event) override;
+
+};