diff --git a/design_reference/RightScreenUI.svg b/design_reference/RightScreenUI.svg deleted file mode 100644 index 0bcedc8..0000000 --- a/design_reference/RightScreenUI.svg +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - ArmVisualization Main Camera Secondary Camera Tertiary Camera Statuses - diff --git a/design_reference/UI Design/left_screen.svg b/design_reference/UI Design/left_screen.svg new file mode 100644 index 0000000..1deb38e --- /dev/null +++ b/design_reference/UI Design/left_screen.svg @@ -0,0 +1,181 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + 1 2 3 4 5 6 + diff --git a/design_reference/UI Design/right_screen.svg b/design_reference/UI Design/right_screen.svg new file mode 100644 index 0000000..a821324 --- /dev/null +++ b/design_reference/UI Design/right_screen.svg @@ -0,0 +1,178 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + 1 2 3 4 5 6 + diff --git a/ground_station/.idea/workspace.xml b/ground_station/.idea/workspace.xml index 62e81c3..642f654 100644 --- a/ground_station/.idea/workspace.xml +++ b/ground_station/.idea/workspace.xml @@ -21,8 +21,8 @@ - - + + @@ -47,12 +47,12 @@ - + @@ -65,24 +65,7 @@ - - - - - - - - - - - - - - + @@ -323,28 +306,28 @@ - + - + - - - + - + + + @@ -379,6 +362,16 @@ + + + + + + + + + + @@ -396,8 +389,8 @@ - - + + diff --git a/ground_station/RoverGroundStation.py b/ground_station/RoverGroundStation.py index 74b49ec..e61b12b 100755 --- a/ground_station/RoverGroundStation.py +++ b/ground_station/RoverGroundStation.py @@ -82,7 +82,7 @@ class VideoTest(QtCore.QThread): self.pixmap = QtGui.QPixmap.fromImage(qimage2ndarray.array2qimage(self.cv_image)) self.image_ready_signal.emit() #print "doin stuff" - self.msleep(10) + self.msleep(20) # TODO: Thread ending message here def __on_image_update_ready(self): @@ -176,7 +176,7 @@ class GroundStation(QtCore.QObject): # Start ROSCORE self.video_test = VideoTest(self.right_screen.primary_video_label, sub_path="/cam1/usb_cam1/image_raw/compressed") - self.video_test_1 = VideoTest(self.right_screen.secondary_video_label, (640, 360), sub_path="/cam2/usb_cam2/image_raw//compressed") + self.video_test_1 = VideoTest(self.right_screen.secondary_video_label, (640, 360), sub_path="/cam2/usb_cam2/image_raw/compressed") self.video_test_2 = VideoTest(self.right_screen.tertiary_video_label, (640, 360), sub_path="/zed/right/image_raw_color/compressed") self.drive_test = DriveTest()