From ffef2711e9b281ea2773bd4a502dd46166855703 Mon Sep 17 00:00:00 2001 From: Ken Steinfeldt Date: Thu, 15 Mar 2018 11:28:34 -0700 Subject: [PATCH 1/4] take out unused vars --- .../ground_station/src/Framework/StatusSystems/StatusCore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py index 579676f..cf63db4 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -50,8 +50,8 @@ class SensorCore(QtCore.QThread): self.shared_objects = shared_objects self.screen_main_window = self.shared_objects["screens"]["left_screen"] - self.cpu_read = self.screen_main_window.lineEdit # type: QtWidgets.QLabel - self.ram_read = self.screen_main_window.lineEdit_2 # type: QtWidgets.QLabel + # self.cpu_read = self.screen_main_window.lineEdit # type: QtWidgets.QLabel + # self.ram_read = self.screen_main_window.lineEdit_2 # type: QtWidgets.QLabel # ########## set vars to gui elements self.rover_conn = self.screen_main_window.rover # type: QtWidgets.QLabel From 0353145c3b0eec31b18ff358b25eed4e59ac397a Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 15 Mar 2018 11:29:52 -0700 Subject: [PATCH 2/4] don't use landmark_list yet --- .../src/Framework/MapSystems/RoverMapCoordinator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py index 54ea45d..659e9f9 100644 --- a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py @@ -133,7 +133,8 @@ class RoverMapCoordinator(QtCore.QThread): def update_overlay(self): navigation_list = self._get_table_elements(self.navigation_label) - landmark_list = self._get_table_elements(self.landmark_label) + # landmark_list = self._get_table_elements(self.landmark_label) + landmark_list = [] self.overlay_image_object.update_new_location(self.latitude, self.longitude, 70, From c9e91297835a4d1f31d6647cef948b2dea3e0146 Mon Sep 17 00:00:00 2001 From: Ken Steinfeldt Date: Thu, 15 Mar 2018 11:32:05 -0700 Subject: [PATCH 3/4] bug fix --- .../ground_station/src/Framework/StatusSystems/StatusCore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py index cf63db4..7774371 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -229,11 +229,11 @@ class SensorCore(QtCore.QThread): self.jetson_cpu_update_ready__signal.connect(self.cpu.setText) self.jetson_cpu_stylesheet_change_ready__signal.connect(self.cpu.setStyleSheet) self.jetson_ram_update_ready__signal.connect(self.ram.setText) - self.jetson_ram_stylesheet_change_ready__signal(self.ram.setStyleSheet) + self.jetson_ram_stylesheet_change_ready__signal.connect(self.ram.setStyleSheet) self.jetson_emmc_update_ready__signal.connect(self.emmc.setText) self.jetson_emmc_stylesheet_change_ready__signal.connect(self.emmc.setStyleSheet) self.jetson_gpu_temp_update_ready__signal.connect(self.gpu_temp.setText) - self.jetson_gpu_temp_stylesheet_change_ready__signal(self.gpu_temp.setStyleSheet) + self.jetson_gpu_temp_stylesheet_change_ready__signal.connect(self.gpu_temp.setStyleSheet) self.bogie_connection_1_stylesheet_change_ready__signal.connect(self.bogie_right.setStyleSheet) self.bogie_connection_2_stylesheet_change_ready__signal.connect(self.bogie_left.setStyleSheet) self.bogie_connection_3_stylesheet_change_ready__signal.connect(self.bogie_rear.setStyleSheet) From be3985c25d1aad23078de18293bce4ad6b16e078 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 15 Mar 2018 11:46:06 -0700 Subject: [PATCH 4/4] change map zoom --- .../MapSystems/RoverMapCoordinator.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py index 659e9f9..2cd3b00 100644 --- a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py @@ -59,21 +59,21 @@ class RoverMapCoordinator(QtCore.QThread): self.logger.debug("Stopping Map Coordinator Thread") - def _setup_map_threads(self): - self.google_maps_object = RoverMap.GMapsStitcher(1280, - 720, - 44.567161, - -123.278432, - 18, - 'satellite', - None, 20) + # def _setup_map_threads(self): + # self.google_maps_object = RoverMap.GMapsStitcher(1280, + # 720, + # 44.567161, + # -123.278432, + # 18, + # 'satellite', + # None, 20) def _map_setup(self): self.google_maps_object = RoverMap.GMapsStitcher(1280, 720, 44.567161, -123.278432, - 18, + 14, 'satellite', None, 20) self.overlay_image_object = (