diff --git a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui index 2fa285b..8c781e5 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui @@ -89,358 +89,6 @@ - - - - background-color: darkgreen; - - - placeholder - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Left Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - FrSky -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - background-color:darkgreen; - - - Right Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Logitech Joystick -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Rear Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - background-color:darkgreen; - - - 3D Nav Mouse -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Main Nav Camera -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - Chassis Camera -Connected - - - Qt::AlignCenter - - - @@ -486,19 +134,61 @@ Connected - - - - - + + background-color: darkgreen; - <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> + placeholder + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkgreen; + + + Right Bogie +Connected + + + Qt::AlignCenter + + + + + + @@ -509,6 +199,16 @@ Connected + + + + background-color: darkgreen; + + + <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> + + + @@ -637,6 +337,306 @@ Fix + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Rear Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Main Nav Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkgreen; + + + 3D Nav Mouse +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Left Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + Chassis Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + FrSky +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Logitech Joystick +Connected + + + Qt::AlignCenter + + + @@ -665,78 +665,303 @@ Fix 0 - - - ROSBAG Recording - - - - - - Camera Recording - - - - - - - Start - - - - - - - Control Recording - - - - - - - Navigation Recording - - - - - - - Statuses Recording - - - - - - - Start - - - - - - - Start - - - - - - - Start - - - - - - Science Data + Science Readouts + + + + + + + + 12 + 75 + true + + + + Soil Probe + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + Soil Temperature: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + N/A + + + + + + + Soil PH: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + N/A + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Read Soil Probe + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Vertical + + + + + + + + + + 12 + 75 + true + + + + Dust Sensor + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + Small Dust Present: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Large Dust Present: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + False + + + + + + + False + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + Settings + + + + + Ubiquiti Radio Channel + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Map Selection + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + OSU Campus + + + + + + + + + + 1 + + + 11 + + + + + + + Apply + + + + + + @@ -798,14 +1023,20 @@ Fix - + 0 - + + 6 + + 0 + + 0 + @@ -816,12 +1047,63 @@ Fix - Manual Waypoint Entry + Manual Waypoint Entry/Editing - + + + + 75 + true + + + + Decimal Format + + + + + + + + + QAbstractSpinBox::NoButtons + + + 9 + + + -90.000000000000000 + + + 90.000000000000000 + + + 0.000001000000000 + + + + + + + QAbstractSpinBox::NoButtons + + + 9 + + + -180.000000000000000 + + + 180.000000000000000 + + + 0.000001000000000 + + + @@ -829,9 +1111,6 @@ Fix - - - @@ -839,38 +1118,266 @@ Fix - - + + + + Qt::Horizontal + + + + 40 + 20 + + + - - - Qt::Vertical - - - - 20 - 40 - - - - - - + - 18 75 true - ENABLE AUTONOMY + Degrees/Minute/Second Format + + + + + + Lattitude + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + " + + + 3 + + + + + + + Longitude + + + + + + + " + + + 3 + + + + + + + ° + + + -90 + + + 90 + + + + + + + ' + + + 60 + + + + + + + ° + + + -180 + + + 90 + + + + + + + ' + + + 60 + + + + + + + + + + + + + N + + + + + S + + + + + + + + + + + + + + W + + + + + E + + + + + + + + + + Qt::Horizontal + + + + + + + + 12 + 75 + true + + + + Autonomy + + + + + + + 6 + + + + + + 12 + + + + Status: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 12 + + + + Control: + + + + + + + + 12 + 75 + true + + + + ENABLE + + + + + + + + 12 + + + + background-color:darkred; + + + DISABLED + + + Qt::AlignCenter + + + + + @@ -951,7 +1458,7 @@ QTableView QTableCornerButton::section{ false - false + true false @@ -983,45 +1490,60 @@ QTableView QTableCornerButton::section{ - LAT + # - LON + Lat - DIST + Lon + + + + + Dist - 32.1665 + 1 - -112.1115 + 32.1665 + + -112.1115 + + + 2.4 KM - 33.1124 + 2 - -111.4334 + 33.1124 + + -111.4334 + + + 5.7 KM @@ -1163,6 +1685,9 @@ GPS + + 0 + @@ -1213,11 +1738,14 @@ QTableView QTableCornerButton::section{ QAbstractItemView::SelectRows + + false + false - false + true false @@ -1249,45 +1777,50 @@ QTableView QTableCornerButton::section{ - LAT + Name - LON + Lat - DIST + Lon - + + + Dist + + + 32.1665 - + -112.1115 - + 2.4 KM - + 33.1124 - + -111.4334 - + 5.7 KM diff --git a/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui index ed7d282..2660aec 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui @@ -858,225 +858,354 @@ 0 - - - - 22 - 75 - true - - - - Current Speed - - - Qt::AlignCenter - - - - - - - 0 - + - - - - 22 - + + + 0 - - 0.0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + + + + + 15 + 75 + true + + + + Current Speed + + + Qt::AlignCenter + + + + + + + 0 + + + + + + 14 + + + + 0.0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 14 + + + + m/s + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 15 + 75 + true + + + + Speed Limit + + + Qt::AlignCenter + + + + + + + 100 + + + 50 + + + Qt::AlignCenter + + + true + + + Qt::Horizontal + + + false + + + QProgressBar::TopToBottom + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 15 + 75 + true + + + + Tank Drive Output + + + Qt::AlignCenter + + + + + + + QFormLayout::ExpandingFieldsGrow + + + 6 + + + + + + 75 + true + + + + Left + + + + + + + background-color:darkred; + + + 0 + + + 100 + + + 0 + + + true + + + + + + + + 75 + true + + + + Right + + + + + + + background-color:darkred; + + + 0 + + + 100 + + + 0 + + + true + + + + + + - - - - 22 - + + + Qt::Vertical - - m/s + + + 20 + 40 + - + + + + + + 0 + + + + + + 15 + 75 + true + + + + IMU Data + + + Qt::AlignCenter + + + + + + + 0 + + + + + 0 + + + + + -100 + + + 100 + + + + + + + + 75 + true + + + + Pitch + + + Qt::AlignCenter + + + + + + + + + 0 + + + + + -100 + + + 100 + + + false + + + true + + + + + + + + 75 + true + + + + Roll + + + Qt::AlignCenter + + + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 22 - 75 - true - - - - Speed Limit - - - Qt::AlignCenter - - - - - - - 100 - - - 50 - - - Qt::AlignCenter - - - true - - - Qt::Horizontal - - - false - - - QProgressBar::TopToBottom - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 22 - 75 - true - - - - Tank Drive Output - - - Qt::AlignCenter - - - - - - - 6 - - - - - - 75 - true - - - - Left - - - - - - - background-color:darkred; - - - 0 - - - 100 - - - 0 - - - true - - - - - - - - 75 - true - - - - Right - - - - - - - background-color:darkred; - - - 0 - - - 100 - - - 0 - - - true - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - -