diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp index 8b58e93cc59175948e81787831ab028ee7cd8a52..bd68e19a95452508c390f706ccf4b6970ff44750 100644 --- a/groundStation/gui/MicroCART/mainwindow.cpp +++ b/groundStation/gui/MicroCART/mainwindow.cpp @@ -23,11 +23,12 @@ MainWindow::MainWindow(QWidget *parent) : nextSpTimer(new QTimer(this)), sp_x(0.0f), sp_y(0.0f), - sp_z(0.0f), - topScene(new QGraphicsScene(this)), - quad(new QuadItem) + sp_z(0.0f) { ui->setupUi(this); + + QGraphicsScene *topScene = new QGraphicsScene(this); + QuadItem * quad = new QuadItem(this); ui->topView->setScene(topScene); topScene->addItem(quad); @@ -50,7 +51,7 @@ MainWindow::MainWindow(QWidget *parent) : this, SLOT (updateTracker(float, float, float, float, float, float))); connect(trackerWorker, SIGNAL (finished(float, float, float, float, float, float)), - this, SLOT (updateQuad(float, float, float, float, float, float))); + this, SLOT (quad->updateQuad(float, float, float, float, float, float))); /* Create another worker for the control graph */ QThread * cwThread = new QThread(this); diff --git a/groundStation/gui/MicroCART/mainwindow.h b/groundStation/gui/MicroCART/mainwindow.h index 568549cfdcef6f7119fa4ea5bd27b228d31a8f20..de7b2a32dc5e3ec0f0099403a676644a0fa8666a 100644 --- a/groundStation/gui/MicroCART/mainwindow.h +++ b/groundStation/gui/MicroCART/mainwindow.h @@ -81,9 +81,6 @@ private: float sp_x; float sp_y; float sp_z; - - QGraphicsScene * topScene; - QuadItem * quad; }; #endif // MAINWINDOW_H diff --git a/groundStation/gui/MicroCART/quaditem.cpp b/groundStation/gui/MicroCART/quaditem.cpp index b43ced998e8720bf1cb7d50823a6bc8f39b3bef5..37c6315f10eef9bc39c8d88c4b40ef7b860f60d6 100644 --- a/groundStation/gui/MicroCART/quaditem.cpp +++ b/groundStation/gui/MicroCART/quaditem.cpp @@ -2,8 +2,9 @@ #include <QPixmap> #include <QLabel> -QuadItem::QuadItem() +QuadItem::QuadItem(QGraphicsItem* parent = nullptr) { + this->setParentItem(parent); setFlag(ItemIsMovable); }