Fixed Alerts to display once. Moved timestamp.

Alerts should only display once now since it uses status flags rather than a distance "window". Timestamp logic was moved to the Alerts class.
joemirizio · Jul 7, 2013 · ffce221 · ffce221
1 parent 07e49dc
commit ffce221
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/display/gui/tkinter_gui.py b/display/gui/tkinter_gui.py
@@ -221,7 +221,8 @@ def update(self):
             self.clear()
 
     def displayAlert(self, alert_text):
-        self.label_text.set(alert_text)
+        ts = datetime.datetime.now().strftime("%H:%M:%S ")
+        self.label_text.set(ts + alert_text)
         self.expire_time = (datetime.datetime.now() +
             datetime.timedelta(seconds=ALERT_DURATION))
 

diff --git a/display/tactical/tactical.py b/display/tactical/tactical.py
@@ -45,14 +45,20 @@ def update(self):
             self.displayTarget(target)
 
             # Display alerts
-            # 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")
+            # TODO Cleanup logic
+            if distance((0, 0), target.pos) < 5:
+                target.left_safe = False
+            elif distance((0, 0), target.pos) < 10:
+                target.left_alert = False
+
+            if distance((0, 0), target.pos) >= 10 and target.left_alert == False:
+                self.data_proc.tca.ui.displayAlert("Target has left the Alert zone")
+                target.left_alert = True
+                target.left_safe = True
+            elif distance((0, 0), target.pos) >= 5 and target.left_safe == False:
+                self.data_proc.tca.ui.displayAlert("Target entered the Alert zone")
+                target.left_alert = False
+                target.left_safe = True
 
     def updateCalibration(self, message):
         if message == 1:

diff --git a/processors/data/target.py b/processors/data/target.py
@@ -34,6 +34,8 @@ def __init__(self, pos):
         self.first_turn = False
         self.second_turn = False
         self.max_velocity = None
+        self.left_safe = None
+        self.left_alert = None
 
     def update(self, pos):
         # TODO Reimplement