From 7154bf0f4713a94d81d86a3eeb48e68b2288619c Mon Sep 17 00:00:00 2001
From: burneykb <burneykb@iastate.edu>
Date: Tue, 18 Apr 2017 22:54:56 -0500
Subject: [PATCH] small fixes to QuadItem
---
groundStation/gui/MicroCART/mainwindow.cpp | 9 +++++----
groundStation/gui/MicroCART/mainwindow.h | 3 ---
groundStation/gui/MicroCART/quaditem.cpp | 3 ++-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 8b58e93cc..bd68e19a9 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 568549cfd..de7b2a32d 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 b43ced998..37c6315f1 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);
}
--
GitLab