summaryrefslogtreecommitdiff
path: root/xgpsspeed
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2018-09-21 17:58:38 -0700
committerGary E. Miller <gem@rellim.com>2018-09-21 17:58:38 -0700
commitac938acd6a9437b8f96da4a265608bb2c3e28381 (patch)
tree12ecb270d8a6425e44a08ac559d0a817f07d2fcf /xgpsspeed
parent04d1b1b0ae337b09d0677e6578a7d877031c75cb (diff)
downloadgpsd-ac938acd6a9437b8f96da4a265608bb2c3e28381.tar.gz
xgpsspeed: pep8 tweaks.
Diffstat (limited to 'xgpsspeed')
-rwxr-xr-xxgpsspeed42
1 files changed, 22 insertions, 20 deletions
diff --git a/xgpsspeed b/xgpsspeed
index 95211906..c17f7098 100755
--- a/xgpsspeed
+++ b/xgpsspeed
@@ -18,6 +18,15 @@ from math import sqrt
from math import radians
from socket import error as SocketError
+import cairo
+
+# Gtk3 imports. Gtk3 requires the require_version(), which then causes
+# pylint to complain about the subsequent "non-top" imports.
+import gi
+from gi.repository import Gtk # pylint: disable=wrong-import-position
+from gi.repository import Gdk # pylint: disable=wrong-import-position
+from gi.repository import GObject # pylint: disable=wrong-import-position
+
import gps
gps_version = '3.18-dev'
@@ -26,15 +35,7 @@ if gps.__version__ != gps_version:
(gps_version, gps.__version__))
sys.exit(1)
-import cairo
-
-# Gtk3 imports. Gtk3 requires the require_version(), which then causes
-# pylint to complain about the subsequent "non-top" imports.
-import gi
gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk # pylint: disable=wrong-import-position
-from gi.repository import Gdk # pylint: disable=wrong-import-position
-from gi.repository import GObject # pylint: disable=wrong-import-position
class Speedometer(Gtk.DrawingArea):
@@ -120,10 +121,10 @@ class LandSpeedometer(Speedometer):
y + (radius - long_inset) * sin(i * pi / 6.0)
)
self.cr.line_to(
- (x + (radius + (self.cr.get_line_width() / 2))
- * cos(i * pi / 6.0)),
- (y + (radius + (self.cr.get_line_width() / 2))
- * sin(i * pi / 6.0))
+ (x + (radius + (self.cr.get_line_width() / 2)) *
+ cos(i * pi / 6.0)),
+ (y + (radius + (self.cr.get_line_width() / 2)) *
+ sin(i * pi / 6.0))
)
self.cr.select_font_face(
'Georgia',
@@ -143,17 +144,17 @@ class LandSpeedometer(Speedometer):
if i in (-8, -7, -6, -5, -4):
self.cr.move_to(
- (x + (radius - long_inset - (t_width / 2))
- * cos(i * pi / 6.0)),
- (y + (radius - long_inset - (t_height * 2))
- * sin(i * pi / 6.0))
+ (x + (radius - long_inset - (t_width / 2)) *
+ cos(i * pi / 6.0)),
+ (y + (radius - long_inset - (t_height * 2)) *
+ sin(i * pi / 6.0))
)
elif i in (-2, -1, 0, 2, 1):
self.cr.move_to(
- (x + (radius - long_inset - (t_width * 1.5))
- * cos(i * pi / 6.0)),
- (y + (radius - long_inset - (t_height * 2))
- * sin(i * pi / 6.0))
+ (x + (radius - long_inset - (t_width * 1.5)) *
+ cos(i * pi / 6.0)),
+ (y + (radius - long_inset - (t_height * 2)) *
+ sin(i * pi / 6.0))
)
elif i in (-3,):
self.cr.move_to(
@@ -705,6 +706,7 @@ class Main(object):
except KeyboardInterrupt:
self.window.emit('delete_event', Gdk.Event(Gdk.NOTHING))
+
if __name__ == '__main__':
import sys
from os.path import basename