diff --git a/software/ground_station/Resources/Ui/left_screen.ui b/software/ground_station/Resources/Ui/left_screen.ui
index c154798..c43eaea 100644
--- a/software/ground_station/Resources/Ui/left_screen.ui
+++ b/software/ground_station/Resources/Ui/left_screen.ui
@@ -34,10 +34,6 @@
1.000000000000000
-
- background-color: #201F1D;
-color: #DCDCDC;
-
@@ -71,9 +67,404 @@ color: #DCDCDC;
540
-
- background-color:lightgreen;
-
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ false
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ Main Nav Cam Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ QFrame::NoFrame
+
+
+ ZED Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ QFrame::NoFrame
+
+
+ Rover Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ FrSky Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ QFrame::NoFrame
+
+
+ Chassis Cam Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ false
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ Undercarriage Cam Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ false
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ 3D Nav Mouse Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ Bogie Group 1 Connected
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9999999
+ 9999999
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 10
+ 75
+ true
+
+
+
+ QLabel{
+ color: #868685;
+}
+
+
+ Bogie Group 2 Connected
+
+
+ Qt::AlignCenter
+
+
+
+
-
@@ -99,6 +490,11 @@ color: #DCDCDC;
0
+
+
+ Autonomy
+
+
Recording
@@ -138,9 +534,6 @@ color: #DCDCDC;
720
-
- background-color:lightblue;
-
@@ -171,9 +564,6 @@ color: #DCDCDC;
360
-
- background-color:salmon;
-
0
@@ -204,9 +594,250 @@ color: #DCDCDC;
360
-
- background-color:teal;
-
+
+
-
+
+
+ 0
+
+
-
+
+
+
+ 12
+ 75
+ true
+
+
+
+ Navigation Waypoints
+
+
+
+ -
+
+
+ QTableView{
+ selection-background-color: #DE8D47;
+}
+
+QTableView QHeaderView{
+ background-color: #201F1D;
+}
+
+QTableView QHeaderView::section{
+ background-color: #201F1D;
+}
+
+QTableView QTableCornerButton::section{
+ background-color: #201F1D;
+}
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ false
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ 59
+
+
+ 53
+
+
+ false
+
+
+ false
+
+
+ 30
+
+
+
+ 1
+
+
+
+
+ 2
+
+
+
+
+ LAT
+
+
+
+
+ LON
+
+
+
+
+ DIST
+
+
+ -
+
+ 32.1665
+
+
+ -
+
+ -112.1115
+
+
+ -
+
+ 2.4 KM
+
+
+ -
+
+ 33.1124
+
+
+ -
+
+ -111.4334
+
+
+ -
+
+ 5.7 KM
+
+
+
+
+ -
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Set
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Add
+Manual
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Add
+GPS
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Delete
+
+
+
+
+
+
+
+
-
@@ -229,9 +860,250 @@ color: #DCDCDC;
360
-
- background-color:lightgreen
-
+
+
-
+
+
+ 0
+
+
-
+
+
+
+ 12
+ 75
+ true
+
+
+
+ Landmark Waypoints
+
+
+
+ -
+
+
+ QTableView{
+ selection-background-color: #DE8D47;
+}
+
+QTableView QHeaderView{
+ background-color: #201F1D;
+}
+
+QTableView QHeaderView::section{
+ background-color: #201F1D;
+}
+
+QTableView QTableCornerButton::section{
+ background-color: #201F1D;
+}
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ false
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ 59
+
+
+ 53
+
+
+ false
+
+
+ false
+
+
+ 30
+
+
+
+ 1
+
+
+
+
+ 2
+
+
+
+
+ LAT
+
+
+
+
+ LON
+
+
+
+
+ DIST
+
+
+ -
+
+ 32.1665
+
+
+ -
+
+ -112.1115
+
+
+ -
+
+ 2.4 KM
+
+
+ -
+
+ 33.1124
+
+
+ -
+
+ -111.4334
+
+
+ -
+
+ 5.7 KM
+
+
+
+
+ -
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Set
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Add
+Manual
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Add
+GPS
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 65
+ 35
+
+
+
+ QPushButton{
+ color: #201F1D;
+ background-color: #868685;
+}
+
+
+ Delete
+
+
+
+
+
+
+
+
diff --git a/software/ground_station/Resources/Ui/right_screen.ui b/software/ground_station/Resources/Ui/right_screen.ui
index 8f8e907..a2e2bae 100644
--- a/software/ground_station/Resources/Ui/right_screen.ui
+++ b/software/ground_station/Resources/Ui/right_screen.ui
@@ -79,9 +79,6 @@ color: #DCDCDC;
720
-
- background-color:orange;
-
-
@@ -113,8 +110,23 @@ color: #DCDCDC;
- background-color:lightgreen;;
+ background-color:black;;
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+
+
+
+
-
@@ -137,9 +149,107 @@ color: #DCDCDC;
360
-
- background-color:salmon;
-
+
+
-
+
+
+
+ 22
+ 75
+ true
+
+
+
+ Current Speed
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 22
+
+
+
+ 2.4 m/s
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 22
+ 75
+ true
+
+
+
+ Speed Limit
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ 50
+
+
+ Qt::AlignCenter
+
+
+ Qt::Horizontal
+
+
+ false
+
+
+ QProgressBar::TopToBottom
+
+
+
+ -
+
+
+
+ 22
+ 75
+ true
+
+
+
+ Tank Drive Output
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
+ 0
+
+
+
+
diff --git a/software/ground_station/RoverGroundStation.py b/software/ground_station/RoverGroundStation.py
index bd8253f..2e7894a 100755
--- a/software/ground_station/RoverGroundStation.py
+++ b/software/ground_station/RoverGroundStation.py
@@ -9,6 +9,8 @@ import signal
import rospy
import logging
import qdarkstyle
+import PIL.Image
+from PIL.ImageQt import ImageQt
# Custom Imports
import Framework.StartupSystems.ROSMasterChecker as ROSMasterChecker
@@ -100,6 +102,9 @@ class GroundStation(QtCore.QObject):
self.connect_signals_and_slots_signal.emit()
self.__connect_signals_to_slots()
self.start_threads_signal.emit()
+
+ compass_image = PIL.Image.open("Resources/Images/compass.png").resize((300, 300)) # PIL.Image
+ self.shared_objects["right_screen"].compass_label.setPixmap(QtGui.QPixmap.fromImage(ImageQt(compass_image)))
def ___ros_master_running(self):
checker = ROSMasterChecker.ROSMasterChecker()