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

Change the include to correct path and remove test file

Browse Source
This commit is contained in:
Chris Pham
2018-02-08 14:13:53 -08:00
parent e9f03deaa2
commit f71bcba2b0
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ground_station/resources/core/mappingtest.py
View File

@@ -1,24 +0,0 @@
#!/usr/bin/python
import mapping
import PIL
obj = mapping.GMapsStitcher(2000, 2000, 44.567161, -123.278432, 18, 'terrain', None, 20)
obj.display_image.save("unzoomed.png")
# draw = PIL.ImageDraw.ImageDraw(obj.big_image)
# draw.rectangle([950, 950, 1050, 1050], fill=128)
# lat, lng = obj.move_latlon(44.559919, -123.280723)
# draw.rectangle([lng-300, lat-300, lng+300, lat+300], fill=328)
# obj.big_image.save("toobig.jpg")
# obj.display_image.save("zoomed.jpg")
obj.add_gps_location(44.559919, -123.280723, "square", 50, (00, 00, 00, 256))
obj.add_gps_location(44.565094, -123.276110, "square", 50, (00, 00, 00, 256))
obj.add_gps_location(44.565777, -123.278902, "square", 50, (00, 00, 00, 256))
obj.display_image.save("box.png")
obj.center_display(44.567161, -123.278432)
obj.display_image.save("centered.png")
obj.big_image.save("toobig.png")
print obj

2
software/ground_station/RoverGroundStation.py
View File

@@ -14,6 +14,7 @@ import qdarkstyle
import Framework.StartupSystems.ROSMasterChecker as ROSMasterChecker
import Framework.LoggingSystems.Logger as Logger
import Framework.VideoSystems.RoverVideoCoordinator as RoverVideoCoordinator
import Framework.MapSystems.RoverMapCoordinator as RoverMapCoordinator
#####################################
# Global Variables
@@ -96,7 +97,6 @@ class GroundStation(QtCore.QObject):
# ##### Instantiate Threaded Classes ######
self.__add_thread("Video Coordinator", RoverVideoCoordinator.RoverVideoCoordinator(self.shared_objects))
self.__add_thread("Map Coordinator", RoverMapCoordinator.RoverMapCoordinator(self.shared_objects))
self.connect_signals_and_slots_signal.emit()
self.__connect_signals_to_slots()
self.start_threads_signal.emit()