diff --git a/CMakeLists.txt b/CMakeLists.txt index ce0dc18..ced740e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,9 @@ qt_add_executable(${AppExec} src/gui/main.cpp src/gui/Interface.cpp src/gui/viewport/Viewport.cpp - src/gui/network/NetworkView.cpp + src/gui/network/NetworkGraphicsView.cpp src/gui/network/NetworkGraphicsScene.cpp + src/gui/network/Network.cpp ) target_link_libraries(${AppExec} PRIVATE Qt6::Core Qt6::Widgets) diff --git a/src/gui/Interface.cpp b/src/gui/Interface.cpp index 0da6220..ea72b39 100644 --- a/src/gui/Interface.cpp +++ b/src/gui/Interface.cpp @@ -1,6 +1,6 @@ #include "gui/Interface.h" #include "gui/viewport/Viewport.h" -#include "gui/network/NetworkView.h" +#include "gui/network/Network.h" #include #include @@ -15,13 +15,13 @@ EnzoUI::EnzoUI() setMinimumSize(1920/2, 1080/2); Viewport* viewport = new Viewport(); - NetworkView* networkView = new NetworkView(this); - networkView->setMinimumWidth(400); + Network* network = new Network(this); + network->setMinimumWidth(400); viewportSplitter_ = new QSplitter(this); viewportSplitter_->addWidget(viewport); - viewportSplitter_->addWidget(networkView); + viewportSplitter_->addWidget(network); mainLayout_->addWidget(viewportSplitter_); } diff --git a/src/gui/network/Network.cpp b/src/gui/network/Network.cpp new file mode 100644 index 0000000..ae34a66 --- /dev/null +++ b/src/gui/network/Network.cpp @@ -0,0 +1,18 @@ +#include "gui/network/Network.h" +#include "gui/network/NetworkGraphicsView.h" +#include "gui/network/NetworkGraphicsScene.h" +#include +#include + +Network::Network(QWidget* parent) +{ + + mainLayout_ = new QVBoxLayout(parent); + + this->setLayout(mainLayout_); + + NetworkGraphicsScene* scene = new NetworkGraphicsScene(); + NetworkGraphicsView* view = new NetworkGraphicsView(parent, scene); + + mainLayout_->addWidget(view); +} diff --git a/src/gui/network/Network.h b/src/gui/network/Network.h new file mode 100644 index 0000000..b169e99 --- /dev/null +++ b/src/gui/network/Network.h @@ -0,0 +1,11 @@ +#pragma once +#include + +class Network +: public QWidget +{ +public: + Network(QWidget* parent = nullptr); +private: + QLayout* mainLayout_; +}; diff --git a/src/gui/network/NetworkView.cpp b/src/gui/network/NetworkGraphicsView.cpp similarity index 84% rename from src/gui/network/NetworkView.cpp rename to src/gui/network/NetworkGraphicsView.cpp index 2b79a79..e2b700a 100644 --- a/src/gui/network/NetworkView.cpp +++ b/src/gui/network/NetworkGraphicsView.cpp @@ -1,14 +1,13 @@ -#include "gui/network/NetworkView.h" +#include "gui/network/NetworkGraphicsView.h" #include #include "gui/network/NetworkGraphicsScene.h" #include #include #include -NetworkView::NetworkView(QWidget *parent) +NetworkGraphicsView::NetworkGraphicsView(QWidget *parent, QGraphicsScene* scene) : QGraphicsView(parent) { - QGraphicsScene *scene = new NetworkGraphicsScene(this); setScene(scene); QPen greenPen = QPen(Qt::green); @@ -24,7 +23,7 @@ NetworkView::NetworkView(QWidget *parent) } -void NetworkView::mousePressEvent(QMouseEvent *event) +void NetworkGraphicsView::mousePressEvent(QMouseEvent *event) { if( event->button() & Qt::MiddleButton @@ -48,7 +47,7 @@ void NetworkView::mousePressEvent(QMouseEvent *event) // } // } -void NetworkView::mouseMoveEvent(QMouseEvent *mouseEvent) +void NetworkGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent) { if( mouseEvent->buttons() & Qt::MiddleButton) diff --git a/src/gui/network/NetworkView.h b/src/gui/network/NetworkGraphicsView.h similarity index 69% rename from src/gui/network/NetworkView.h rename to src/gui/network/NetworkGraphicsView.h index e8e1964..33d0a28 100644 --- a/src/gui/network/NetworkView.h +++ b/src/gui/network/NetworkGraphicsView.h @@ -1,12 +1,13 @@ #pragma once #include #include +#include -class NetworkView +class NetworkGraphicsView : public QGraphicsView { public: - NetworkView(QWidget *parent = nullptr); + NetworkGraphicsView(QWidget *parent = nullptr, QGraphicsScene* scene = nullptr); private: QPointF panStartPos;