From 2447b64abe9ea9a70067b1a181b3a96ee278f14c Mon Sep 17 00:00:00 2001
From: burneykb <burneykb@iastate.edu>
Date: Tue, 18 Apr 2017 23:44:56 -0500
Subject: [PATCH] couple of fixes in mainwindow.cpp
---
groundStation/gui/MicroCART/mainwindow.cpp | 6 +++---
groundStation/gui/MicroCART/quaditem.h | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 749f45fe2..22df6f238 100644
--- a/groundStation/gui/MicroCART/mainwindow.cpp
+++ b/groundStation/gui/MicroCART/mainwindow.cpp
@@ -51,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 (quad->updateQuad(float, float, float, float, float, float)));
+ quad, SLOT (quad->updateQuad(float, float, float, float, float, float)));
/* Create another worker for the control graph */
QThread * cwThread = new QThread(this);
@@ -144,7 +144,7 @@ void MainWindow::updateTracker(float x, float y, float z, float p, float r, floa
void MainWindow::on_pbStart_clicked()
{
QProcessEnvironment::systemEnvironment().insert("UCART_SOCKET", ui->socketPath->text());
- this->backendPid = startBackend(ui->backendPath->text().toStdString().c_str(), &backendPipe);
+ this->backendPid = startBackend(ui->backendPath_2->text().toStdString().c_str(), &backendPipe);
ui->pbStart->setEnabled(false);
ui->pbStop->setEnabled(true);
backendState = 1;
@@ -178,7 +178,7 @@ void MainWindow::on_chooseBackend_clicked()
{
QString backendPath = QFileDialog::getOpenFileName(this,
tr("Path to Backend Executable"));
- ui->backendPath->setText(backendPath);
+ ui->backendPath_2->setText(backendPath);
}
diff --git a/groundStation/gui/MicroCART/quaditem.h b/groundStation/gui/MicroCART/quaditem.h
index a97bdfa48..068880219 100644
--- a/groundStation/gui/MicroCART/quaditem.h
+++ b/groundStation/gui/MicroCART/quaditem.h
@@ -9,8 +9,9 @@
#include <QtGui>
#include <QTransform>
-class QuadItem : public QGraphicsItem
+class QuadItem : public QObject, public QGraphicsItem
{
+ Q_OBJECT
public:
QuadItem();
QRectF boundingRect() const;
--
GitLab