From 275d0406f7260405a62a4bda14ba74d19c9b0ad2 Mon Sep 17 00:00:00 2001
From: Ellissa Peterson <ellissa@iastate.edu>
Date: Sun, 6 Mar 2022 19:53:50 -0600
Subject: [PATCH] UI updated
---
groundStation/gui/MicroCART/mainwindow.cpp | 22 +-
groundStation/gui/MicroCART/mainwindow.ui | 269 +++++++++++----------
2 files changed, 154 insertions(+), 137 deletions(-)
diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 8a2678008..82dcda9ba 100644
--- a/groundStation/gui/MicroCART/mainwindow.cpp
+++ b/groundStation/gui/MicroCART/mainwindow.cpp
@@ -207,12 +207,12 @@ void MainWindow::updatePosAtt()
void MainWindow::updateTracker(float x, float y, float z, float p, float r, float yaw)
{
- ui->xActual->setText(QString::number(x));
- ui->yActual->setText(QString::number(y));
- ui->zActual->setText(QString::number(z));
- ui->pitchActual->setText(QString::number(p));
- ui->rollActual->setText(QString::number(r));
- ui->yawActual->setText(QString::number(yaw));
+ // ui->xActual->setText(QString::number(x));
+ // ui->yActual->setText(QString::number(y));
+ // ui->zActual->setText(QString::number(z));
+ ui->pActual->setText(QString::number(p));
+ ui->rActual->setText(QString::number(r));
+ ui->yActual->setText(QString::number(yaw));
float dist = sqrt(pow(x - sp_x, 2.0) + pow(y - sp_y, 2.0) + pow(z - sp_z, 2.0));
@@ -514,12 +514,12 @@ void MainWindow::newControlGraph(QString graph)
void MainWindow::on_pbActualToWaypoint_clicked()
{
- QString str("[" + ui->xActual->text() + ", "+
- ui->yActual->text() + ", " +
- ui->zActual->text() + ", " +
- ui->yawActual->text() + "]");
+ // QString str("[" + ui->xActual->text() + ", "+
+ // ui->yActual->text() + ", " +
+ // ui->zActual->text() + ", " +
+ // ui->yawActual->text() + "]");
- setpointList->appendRow(new QStandardItem(str));
+ // setpointList->appendRow(new QStandardItem(str));
}
void MainWindow::on_pbMoveUp_clicked()
diff --git a/groundStation/gui/MicroCART/mainwindow.ui b/groundStation/gui/MicroCART/mainwindow.ui
index 38cd3a429..019cb4561 100644
--- a/groundStation/gui/MicroCART/mainwindow.ui
+++ b/groundStation/gui/MicroCART/mainwindow.ui
@@ -14,7 +14,7 @@
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralWidget">
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout_1">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
@@ -24,9 +24,9 @@
<attribute name="title">
<string>Backend</string>
</attribute>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <layout class="QHBoxLayout" name="horizontalLayout_1">
<item>
<widget class="QLineEdit" name="backendPath">
<property name="enabled">
@@ -50,7 +50,7 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pbStart">
<property name="enabled">
@@ -483,9 +483,9 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
- <layout class="QVBoxLayout" name="verticalLayout_7">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <widget class="QLabel" name="label_6">
+ <widget class="QLabel" name="label_1">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -503,14 +503,14 @@
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
- <widget class="QLabel" name="xLabel">
+ <widget class="QLabel" name="pLabel">
<property name="text">
- <string>X</string>
+ <string>Pitch</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QLineEdit" name="xActual">
+ <widget class="QLineEdit" name="pActual">
<property name="enabled">
<bool>false</bool>
</property>
@@ -523,14 +523,14 @@
</widget>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="yLabel">
+ <widget class="QLabel" name="rLabel">
<property name="text">
- <string>Y</string>
+ <string>Roll</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QLineEdit" name="yActual">
+ <widget class="QLineEdit" name="rActual">
<property name="enabled">
<bool>false</bool>
</property>
@@ -543,14 +543,14 @@
</widget>
</item>
<item row="2" column="0">
- <widget class="QLabel" name="zLabel">
+ <widget class="QLabel" name="yLabel">
<property name="text">
- <string>Z</string>
+ <string>Yaw</string>
</property>
</widget>
</item>
<item row="2" column="1">
- <widget class="QLineEdit" name="zActual">
+ <widget class="QLineEdit" name="yActual">
<property name="enabled">
<bool>false</bool>
</property>
@@ -562,15 +562,49 @@
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="pLabel">
+ </layout>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pbActualToWaypoint">
+ <property name="text">
+ <string>Send</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Send Rate</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="pRateLabel">
<property name="text">
- <string>P</string>
+ <string>Pitch Rate</string>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="pitchActual">
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="pRateActual">
<property name="enabled">
<bool>false</bool>
</property>
@@ -582,15 +616,15 @@
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="rLabel">
+ <item row="1" column="0">
+ <widget class="QLabel" name="rRateLabel">
<property name="text">
- <string>R</string>
+ <string>Roll Rate</string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="rollActual">
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="rRateActual">
<property name="enabled">
<bool>false</bool>
</property>
@@ -602,15 +636,15 @@
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="yLabel_2">
+ <item row="2" column="0">
+ <widget class="QLabel" name="yRateLabel">
<property name="text">
- <string>Y</string>
+ <string>Yaw Rate</string>
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QLineEdit" name="yawActual">
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="yRateActual">
<property name="enabled">
<bool>false</bool>
</property>
@@ -625,16 +659,46 @@
</layout>
</item>
<item>
- <widget class="Line" name="line_6">
+ <widget class="QPushButton" name="pbActualToSetpoint">
+ <property name="text">
+ <string>Send</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <layout class="QFormLayout" name="formLayout_5">
+ <widget class="QLabel" name="label_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Send Thrust</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="thrustLabel">
+ <property name="text">
+ <string>Thrust</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="1">
- <widget class="QLineEdit" name="dist">
+ <widget class="QLineEdit" name="thrustActual">
<property name="enabled">
<bool>false</bool>
</property>
@@ -646,33 +710,10 @@
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_10">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>D</string>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_5"/>
- </item>
- <item>
- <widget class="QPushButton" name="pbActualToSetpoint">
- <property name="text">
- <string>To Setpoint</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbActualToWaypoint">
+ <widget class="QPushButton" name="sendThrustButton">
<property name="text">
<string>To Waypoint</string>
</property>
@@ -927,107 +968,83 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="pbNextSetpoint">
+ <widget class="Line" name="line_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string>Send Next</string>
+ <string>Current Position</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QPushButton" name="pbMoveUp">
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="tsLabel">
<property name="text">
- <string>Move Up</string>
+ <string>TS: </string>
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="pbMoveDown">
+ <item row="0" column="1">
+ <widget class="QLabel" name="tsActual">
<property name="text">
- <string>Move Down</string>
+ <string>N/A</string>
</property>
</widget>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="pbSaveWaypoints">
+ <item row="1" column="0">
+ <widget class="QLabel" name="currRLabel">
<property name="text">
- <string>Save</string>
+ <string>Current Roll: </string>
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="pbLoadWaypoints">
- <property name="text">
- <string>Load</string>
+ <item row="1" column="1">
+ <widget class="QLabel" name="currRActual">
+ <property name="text">
+ <string>N/A</string>
</property>
</widget>
</item>
- </layout>
- </item>
- <item>
- <widget class="Line" name="line_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="autonavEnabled">
- <property name="text">
- <string>Enable Autonavigation</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QFormLayout" name="formLayout_6">
- <item row="0" column="0">
- <widget class="QLabel" name="label_9">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <item row="2" column="0">
+ <widget class="QLabel" name="currPLabel">
<property name="text">
- <string>Threshold</string>
+ <string>Current Pitch: </string>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="delayLabel">
+ <item row="2" column="1">
+ <widget class="QLabel" name="currPActual">
<property name="text">
- <string>Delay</string>
+ <string>N/A</string>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="autonavThreshold">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <item row="3" column="0">
+ <widget class="QLabel" name="currYLabel">
<property name="text">
- <string>0.1</string>
+ <string>Current Yaw: </string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="autonavDelay">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <item row="3" column="1">
+ <widget class="QLabel" name="currYActual">
<property name="text">
- <string>88</string>
+ <string>N/A</string>
</property>
</widget>
</item>
@@ -1036,7 +1053,7 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_9">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QCustomPlot" name="dataPlot" native="true">
<property name="sizePolicy">
--
GitLab