[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gpsd-commit-watch
Subject:    [Gpsd-commit-watch] r5580 - trunk
From:       bzed at BerliOS <bzed () mail ! berlios ! de>
Date:       2009-05-26 12:06:52
Message-ID: 200905261206.n4QC6q3P027043 () sheep ! berlios ! de
[Download RAW message or body]

Author: bzed
Date: 2009-05-26 14:06:52 +0200 (Tue, 26 May 2009)
New Revision: 5580

Modified:
   trunk/gps.py
Log:
gps.py: Fix gpsdata.__repr__()

Right-align the signal strength, unify column spacing,
put the time on a line by itself and align it with the rest,
always use percent-formatting.

Modified: trunk/gps.py
===================================================================
--- trunk/gps.py	2009-05-26 12:06:45 UTC (rev 5579)
+++ trunk/gps.py	2009-05-26 12:06:52 UTC (rev 5580)
@@ -121,7 +121,7 @@
             self.ss = ss
             self.used = used
         def __repr__(self):
-            return "PRN: %3d  E: %3d  Az: %3d  Ss: %d Used: %s" % (
+            return "PRN: %3d  E: %3d  Az: %3d  Ss: %3d  Used: %s" % (
                 self.PRN, self.elevation, self.azimuth, self.ss, "ny"[self.used]
             )
 
@@ -155,8 +155,8 @@
         self.devices = []
 
     def __repr__(self):
-        st = "Time: %s (%s)" % (self.utc, self.fix.time)
-        st += "Lat/lon:  %f %f\n" % (self.fix.latitude, self.fix.longitude)
+        st = "Time:     %s (%s)\n" % (self.utc, self.fix.time)
+        st += "Lat/Lon:  %f %f\n" % (self.fix.latitude, self.fix.longitude)
         if isnan(self.fix.altitude):
             st += "Altitude: ?\n"
         else:
@@ -169,13 +169,13 @@
             st += "Track:    ?\n"
         else:
             st += "Track:    %f\n" % (self.fix.track)
-        st += "Status:   STATUS_%s\n" %("NO_FIX","FIX","DGPS_FIX")[self.status]
-        st += "Mode:     MODE_"+("ZERO", "NO_FIX", "2D","3D")[self.fix.mode]+"\n"
+        st += "Status:   STATUS_%s\n" % ("NO_FIX", "FIX", "DGPS_FIX")[self.status]
+        st += "Mode:     MODE_%s\n" % ("ZERO", "NO_FIX", "2D", "3D")[self.fix.mode]
         st += "Quality:  %d p=%2.2f h=%2.2f v=%2.2f t=%2.2f g=%2.2f\n" % \
               (self.satellites_used, self.pdop, self.hdop, self.vdop, self.tdop, self.gdop)
         st += "Y: %s satellites in view:\n" % len(self.satellites)
         for sat in self.satellites:
-          st += "    " + repr(sat) + "\n"
+          st += "    %r\n" % sat
         return st
 
 class gps(gpsdata):

_______________________________________________
Gpsd-commit-watch mailing list
Gpsd-commit-watch@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/gpsd-commit-watch
[prev in list] [next in list] [prev in thread] [next in thread]