whitespace cleanup
This commit is contained in:
parent
ef0d71855f
commit
86370f7273
20
main.py
20
main.py
@ -28,11 +28,11 @@ class CompassScreen(Screen):
|
|||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
super(CompassScreen, self).__init__(**kwargs)
|
super(CompassScreen, self).__init__(**kwargs)
|
||||||
Window.bind(on_keyboard=self.android_back_click)
|
Window.bind(on_keyboard=self.android_back_click)
|
||||||
|
|
||||||
def android_back_click(self, window, key, *largs):
|
def android_back_click(self, window, key, *largs):
|
||||||
if key == 27 and self.parent is not None:
|
if key == 27 and self.parent is not None:
|
||||||
self.parent.current='map'
|
self.parent.current='map'
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -42,10 +42,10 @@ class SettingsScreen(Screen):
|
|||||||
Window.bind(on_keyboard=self.android_back_click)
|
Window.bind(on_keyboard=self.android_back_click)
|
||||||
|
|
||||||
def android_back_click(self, window, key, *largs):
|
def android_back_click(self, window, key, *largs):
|
||||||
|
|
||||||
if key == 27 and self.parent is not None:
|
if key == 27 and self.parent is not None:
|
||||||
self.parent.current='map'
|
self.parent.current='map'
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -57,8 +57,8 @@ class FlockompassApp(App):
|
|||||||
fbearing = NumericProperty(0)
|
fbearing = NumericProperty(0)
|
||||||
|
|
||||||
dest_distance = StringProperty("")
|
dest_distance = StringProperty("")
|
||||||
dashboard_dest = StringProperty("")
|
dashboard_dest = StringProperty("")
|
||||||
dashboard_flock = StringProperty("")
|
dashboard_flock = StringProperty("")
|
||||||
|
|
||||||
def dump(self, dt):
|
def dump(self, dt):
|
||||||
print(dt, self.gps_data, self.session_data)
|
print(dt, self.gps_data, self.session_data)
|
||||||
@ -112,7 +112,7 @@ class FlockompassApp(App):
|
|||||||
dest_distance = "%i metros" % dest_distance
|
dest_distance = "%i metros" % dest_distance
|
||||||
else:
|
else:
|
||||||
dest_distance = "%0.1f km" % dest_distance
|
dest_distance = "%0.1f km" % dest_distance
|
||||||
|
|
||||||
self.dest_distance = "Destino: %s\nVel: %0.1f km/h" % (dest_distance,
|
self.dest_distance = "Destino: %s\nVel: %0.1f km/h" % (dest_distance,
|
||||||
self.gps_data['speed'])
|
self.gps_data['speed'])
|
||||||
|
|
||||||
@ -214,13 +214,13 @@ class FlockompassApp(App):
|
|||||||
self.cs = CompassScreen(name='compass')
|
self.cs = CompassScreen(name='compass')
|
||||||
self.cs._anim = None
|
self.cs._anim = None
|
||||||
self.cs._anim1 = None
|
self.cs._anim1 = None
|
||||||
|
|
||||||
screen_manager.add_widget(self.cs)
|
screen_manager.add_widget(self.cs)
|
||||||
|
|
||||||
self.ss = SettingsScreen(name='settings')
|
self.ss = SettingsScreen(name='settings')
|
||||||
screen_manager.add_widget(self.ss)
|
screen_manager.add_widget(self.ss)
|
||||||
|
|
||||||
|
|
||||||
# smoothing vars for compass
|
# smoothing vars for compass
|
||||||
self.last_angle = 0
|
self.last_angle = 0
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user