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

fixed wrong size references

Browse Source
This commit is contained in:
Chris Pham
2018-02-08 13:57:49 -08:00
parent f4d6835e85
commit 4455e57693
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ground_station/resources/core/RoverMap.py
View File

@@ -243,7 +243,7 @@ class GMapsStitcher(object):
new_value = self.upper_y - diff new_value = self.upper_y - diff
if !(new_value > 0 and if !(new_value > 0 and
new_value < self.big_image.size[0] - self.height): new_value < self.big_image.size[1] - self.height):
return self.upper_y return self.upper_y
else: else:
return new_value return new_value

11
ground_station/resources/core/RoverMapCoordinator.py
View File

@@ -23,7 +23,8 @@ class RoverMapCoordinator(QtCore.QThread):
super(RoverMapCoordinator, self).init() super(RoverMapCoordinator, self).init()
self.shared_objects = shared_objects self.shared_objects = shared_objects
self.right_screen = self.shared_objects["screens"]["left_screen"] self.left_screen = self.shared_objects["screens"]["left_screen"]
self.mapping_label = self.left_screen.mapping_label
self.setings = QtCore.QSettings() self.setings = QtCore.QSettings()
@@ -48,8 +49,12 @@ class RoverMapCoordinator(QtCore.QThread):
self.map_thread.wait() self.map_thread.wait()
def _setup_map_threads(self): def _setup_map_threads(self):
self.map_thread = RoverMap.GMapsStitcher(2000, self.map_thread = RoverMap.GMapsStitcher(1280,
2000, 44.567161, -123.278432, 720, 44.567161, -123.278432,
18, 'terrain', None, 20) 18, 'terrain', None, 20)
def pixmap_ready_slot(self):
self.mapping_label.setPixmap(self.map_thread.display_image)
def on_kill_threads_requested_slot(self):
self.run_thread_flag = false