caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 10:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018

Browse Source
This commit is contained in:
Corwin Perren
2018-02-26 21:29:26 -08:00
parent 9470708708 ff1d45f880
commit 0d33eadcc5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
software/ground_station/Framework/VideoSystems/RoverVideoReceiver.py
View File

@@ -93,7 +93,7 @@ class RoverVideoReceiver(QtCore.QThread):
# Initial class setup to make text images and get camera resolutions # Initial class setup to make text images and get camera resolutions
self.__create_camera_name_opencv_images() self.__create_camera_name_opencv_images()
self.__get_camera_available_resolutions() self.__get_camera_available_resolutions()
self.__setup_reconfigure_clients() #self.__setup_reconfigure_clients()
def run(self): def run(self):
self.logger.debug("Starting \"%s\" Camera Thread" % self.camera_title_name) self.logger.debug("Starting \"%s\" Camera Thread" % self.camera_title_name)
@@ -155,7 +155,7 @@ class RoverVideoReceiver(QtCore.QThread):
self.__update_camera_subscription_and_settings() self.__update_camera_subscription_and_settings()
if self.new_frame and self.current_camera_settings["resolution"]: if self.new_frame and self.current_camera_settings["resolution"]:
self.__perform_quality_check_and_adjust() # self.__perform_quality_check_and_adjust()
opencv_image = self.bridge.compressed_imgmsg_to_cv2(self.raw_image, "rgb8") opencv_image = self.bridge.compressed_imgmsg_to_cv2(self.raw_image, "rgb8")