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

Changed UI file to allow 180 from 90 and abs numbers

Browse Source
This commit is contained in:
Chris Pham
2018-04-14 14:08:54 -07:00
parent ad2c77c748
commit 4daf40a229
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py
View File

@@ -226,10 +226,10 @@ class WaypointsCoordinator(QtCore.QThread):
self.latitude_label.setValue(lat) self.latitude_label.setValue(lat)
self.longitude_label.setValue(lng) self.longitude_label.setValue(lng)
lat_d = float(int(lat)) lat_d = float(abs(int(lat)))
lat_m = float(int((lat - lat_d) * 60)) lat_m = float(int((abs(lat) - lat_d) * 60))
lat_s = ((lat - lat_d - (lat_m/60.0)) * 3600.) lat_s = ((abs(lat) - lat_d - (lat_m/60.0)) * 3600.)
if lat_d > 0: if lat > 0.:
self.latitude_card_label.setCurrentText("N") self.latitude_card_label.setCurrentText("N")
else: else:
self.latitude_card_label.setCurrentText("S") self.latitude_card_label.setCurrentText("S")
@@ -237,10 +237,10 @@ class WaypointsCoordinator(QtCore.QThread):
self.latitude_minute_label.setValue(lat_m) self.latitude_minute_label.setValue(lat_m)
self.latitude_second_label.setValue(lat_s) self.latitude_second_label.setValue(lat_s)
lng_d = float(int(lng)) lng_d = float(abs(int(lng)))
lng_m = float(int((lng - lng_d) * 60)) lng_m = float(int((abs(lng) - lng_d) * 60))
lng_s = ((lng - lng_d - (lng_m/60.0)) * 3600.) lng_s = ((abs(lng) - lng_d - (lng_m/60.0)) * 3600.)
if lng_d > 0: if lng > 0.:
self.longitude_card_label.setCurrentText("E") self.longitude_card_label.setCurrentText("E")
else: else:
self.longitude_card_label.setCurrentText("W") self.longitude_card_label.setCurrentText("W")

2
software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui
View File

@@ -1505,7 +1505,7 @@ Connected</string>
<number>-180</number> <number>-180</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>90</number> <number>180</number>
</property> </property>
</widget> </widget>
</item> </item>