From f71bcba2b080bbc51f9d5eda2f2ae3010d332f68 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 8 Feb 2018 14:13:53 -0800 Subject: [PATCH] Change the include to correct path and remove test file --- ground_station/resources/core/mappingtest.py | 24 ------------------- software/ground_station/RoverGroundStation.py | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100755 ground_station/resources/core/mappingtest.py diff --git a/ground_station/resources/core/mappingtest.py b/ground_station/resources/core/mappingtest.py deleted file mode 100755 index 4a5414a..0000000 --- a/ground_station/resources/core/mappingtest.py +++ /dev/null @@ -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 diff --git a/software/ground_station/RoverGroundStation.py b/software/ground_station/RoverGroundStation.py index 392ee5c..d45fefd 100755 --- a/software/ground_station/RoverGroundStation.py +++ b/software/ground_station/RoverGroundStation.py @@ -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()