Skip to content
Snippets Groups Projects
Commit a7e713f6 authored by Jake's avatar Jake
Browse files

Added actual to setpoint button

parent 37d734a0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
groundStation/gui/MicroCART/mainwindow.cpp
+ 13
− 6
View file @ a7e713f6
...@@ -99,12 +99,12 @@ void MainWindow::updateConsole() ...@@ -99,12 +99,12 @@ void MainWindow::updateConsole()
void MainWindow::updateTracker(float x, float y, float z, float p, float r, float yaw) void MainWindow::updateTracker(float x, float y, float z, float p, float r, float yaw)
{ {
findChild<QLineEdit *>("xLineEdit")->setText(QString::number(x)); findChild<QLineEdit *>("xActual")->setText(QString::number(x));
findChild<QLineEdit *>("yLineEdit")->setText(QString::number(y)); findChild<QLineEdit *>("yActual")->setText(QString::number(y));
findChild<QLineEdit *>("zLineEdit")->setText(QString::number(z)); findChild<QLineEdit *>("zActual")->setText(QString::number(z));
findChild<QLineEdit *>("pLineEdit")->setText(QString::number(p)); findChild<QLineEdit *>("pitchActual")->setText(QString::number(p));
findChild<QLineEdit *>("rLineEdit")->setText(QString::number(r)); findChild<QLineEdit *>("rollActual")->setText(QString::number(r));
findChild<QLineEdit *>("yLineEdit_2")->setText(QString::number(yaw)); findChild<QLineEdit *>("yawActual")->setText(QString::number(yaw));
} }
void MainWindow::on_pbStart_clicked() void MainWindow::on_pbStart_clicked()
...@@ -266,3 +266,10 @@ void MainWindow::sendSelectedSetpoint() ...@@ -266,3 +266,10 @@ void MainWindow::sendSelectedSetpoint()
sendSetpoints(); sendSetpoints();
} }
} }
void MainWindow::on_pbActualToSetpoint_clicked()
{
findChild<QLineEdit *>("xSetpoint")->setText(findChild<QLineEdit *>("xActual")->text());
findChild<QLineEdit *>("ySetpoint")->setText(findChild<QLineEdit *>("yActual")->text());
findChild<QLineEdit *>("zSetpoint")->setText(findChild<QLineEdit *>("zActual")->text());
}
groundStation/gui/MicroCART/mainwindow.h
+ 2
− 0
View file @ a7e713f6
...@@ -52,6 +52,8 @@ private slots: ...@@ -52,6 +52,8 @@ private slots:
void sendSetpoints(); void sendSetpoints();
void sendSelectedSetpoint(); void sendSelectedSetpoint();
void on_pbActualToSetpoint_clicked();
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
pid_t backendPid; pid_t backendPid;
......
groundStation/gui/MicroCART/mainwindow.ui
+ 173
− 122
View file @ a7e713f6
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="status"> <widget class="QWidget" name="navigation">
<attribute name="title"> <attribute name="title">
<string>Navigation</string> <string>Navigation</string>
</attribute> </attribute>
...@@ -279,140 +279,184 @@ ...@@ -279,140 +279,184 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="fieldGrowthPolicy"> <item>
<enum>QFormLayout::ExpandingFieldsGrow</enum> <widget class="QLabel" name="label_6">
</property>
<item row="0" column="0">
<widget class="QLabel" name="xLabel">
<property name="text">
<string>X</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="xLineEdit">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="yLabel">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="yLineEdit">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="zLabel">
<property name="text">
<string>Z</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="zLineEdit">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="pLabel">
<property name="text">
<string>P</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="pLineEdit">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="rLabel">
<property name="text"> <property name="text">
<string>R</string> <string>Current Position</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item>
<widget class="QLineEdit" name="rLineEdit"> <layout class="QFormLayout" name="formLayout">
<property name="enabled"> <property name="fieldGrowthPolicy">
<bool>false</bool> <enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
</widget> <item row="0" column="0">
<widget class="QLabel" name="xLabel">
<property name="text">
<string>X</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="xActual">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="yLabel">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="yActual">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="zLabel">
<property name="text">
<string>Z</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="zActual">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="pLabel">
<property name="text">
<string>P</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="pitchActual">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="rLabel">
<property name="text">
<string>R</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="rollActual">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="yLabel_2">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="yawActual">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="5" column="0"> <item>
<widget class="QLabel" name="yLabel_2"> <widget class="QPushButton" name="pbActualToSetpoint">
<property name="text"> <property name="text">
<string>Y</string> <string>To Setpoint</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item>
<widget class="QLineEdit" name="yLineEdit_2"> <spacer name="verticalSpacer_4">
<property name="enabled"> <property name="orientation">
<bool>false</bool> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizePolicy"> <property name="sizeHint" stdset="0">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <size>
<horstretch>0</horstretch> <width>20</width>
<verstretch>0</verstretch> <height>40</height>
</sizepolicy> </size>
</property> </property>
</widget> </spacer>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Position Setpoints</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="setpointLabel"> <widget class="QLabel" name="setpointLabel">
<property name="text"> <property name="text">
<string>Setpoint</string> <string>X</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -426,13 +470,6 @@ ...@@ -426,13 +470,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="setpointLabel_2">
<property name="text">
<string>Setpoint</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="ySetpoint"> <widget class="QLineEdit" name="ySetpoint">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -443,13 +480,6 @@ ...@@ -443,13 +480,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="setpointLabel_3">
<property name="text">
<string>Setpoint</string>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="zSetpoint"> <widget class="QLineEdit" name="zSetpoint">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -460,6 +490,20 @@ ...@@ -460,6 +490,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="setpointLabel_3">
<property name="text">
<string>Z</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="setpointLabel_2">
<property name="text">
<string>Y</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
...@@ -513,6 +557,13 @@ ...@@ -513,6 +557,13 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Saved Setpoints</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QListView" name="setpointList"> <widget class="QListView" name="setpointList">
<property name="editTriggers"> <property name="editTriggers">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment