From f6dae57fd760259b45ba8d86ea27d4bc161523e8 Mon Sep 17 00:00:00 2001
From: ucart <ucart_groundstation@iastate.edu>
Date: Mon, 15 Oct 2018 17:40:34 -0500
Subject: [PATCH] continuing to connect new UI features to mainwindow.cpp
---
groundStation/gui/MicroCART/mainwindow.cpp | 6 ++++++
groundStation/gui/MicroCART/mainwindow.ui | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 28846792e..d91ea12c1 100644
--- a/groundStation/gui/MicroCART/mainwindow.cpp
+++ b/groundStation/gui/MicroCART/mainwindow.cpp
@@ -556,6 +556,12 @@ void MainWindow::on_pbLoadWaypoints_clicked()
}
}
+void Mainwindow::on_update_data_request_params_button_clicked()
+{
+ QString text = "testing button pressing";
+ ui->flight_data_labelsetText(text);
+}
+
void MainWindow::on_xSetpoint_returnPressed()
{
sp_x = ui->xSetpoint->text().toFloat();
diff --git a/groundStation/gui/MicroCART/mainwindow.ui b/groundStation/gui/MicroCART/mainwindow.ui
index 086cd22a8..94d275d70 100644
--- a/groundStation/gui/MicroCART/mainwindow.ui
+++ b/groundStation/gui/MicroCART/mainwindow.ui
@@ -1198,7 +1198,7 @@
<string>Update Data Request Parameters</string>
</property>
</widget>
- <widget class="QLabel" name="label_19">
+ <widget class="QLabel" name="flight_data_label">
<property name="geometry">
<rect>
<x>10</x>
--
GitLab