Timestamp added to alerts

Uncommitted changes for "status flags" in development so that timestamp can be modified to only display once (will also be needed later for logging alerts).
joemirizio · Jul 6, 2013 · 07e49dc · 07e49dc · joemirizio · Jul 6, 2013
1 parent 1075a0f
commit 07e49dc
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/display/tactical/tactical.py b/display/tactical/tactical.py
@@ -45,11 +45,14 @@ def update(self):
             self.displayTarget(target)
 
             # Display alerts
-            # TODO Clean up
-            if distance((0, 0), target.pos) > 10 and distance((0, 0), target.pos) < 10.3:
-                self.data_proc.tca.ui.displayAlert("Target has left the Alert zone")
-            elif distance((0, 0), target.pos) > 5 and distance((0, 0), target.pos) < 5.3:
-                self.data_proc.tca.ui.displayAlert("Target entered the Alert zone")
+            # TODO Cleanup
+            # TODO Change timestamp to only show time of entering/exiting
+            if distance((0, 0), target.pos) >= 10 and distance((0, 0), target.pos) < 10.3:
+                ts = datetime.now().strftime("%H:%M:%S")
+                self.data_proc.tca.ui.displayAlert(ts + " Target has left the Alert zone")
+            elif distance((0, 0), target.pos) >= 5 and distance((0, 0), target.pos) < 5.3:
+                ts = datetime.now().strftime("%H:%M:%S")
+                self.data_proc.tca.ui.displayAlert(ts + " Target entered the Alert zone")
 
     def updateCalibration(self, message):
         if message == 1: