Changeset 1161:38b1f077d211

Timestamp:

04/28/24 07:49:42 (11 days ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Tags:

tip

Message:

Arriving earlier is never a warning or error to be explaned

File:

• src/mlx/flight.py (modified) (3 diffs)

src/mlx/flight.py

@@ -55 +55 @@
     @staticmethod
     def isTimeDifferenceTooMuch(scheduledTime, realTimestamp,
-                                earlyOnlyWarning = False):
+                                earlyOnlyWarning = False,
+                                earlyOK = False):
         """Determine if the given real time differs to much from the scheduled
         time.
@@ -69 +70 @@
         realMinute = realTime.tm_hour * 60 + realTime.tm_min
 
-        diff = abs(Flight.getMinutesDifference(scheduledMinute, realMinute))
-
-        return (diff>Flight.TIME_WARNING_DIFFERENCE,
-                False if earlyOnlyWarning else diff>Flight.TIME_ERROR_DIFFERENCE)
+        diff = Flight.getMinutesDifference(scheduledMinute, realMinute)
+
+        return (diff<-Flight.TIME_WARNING_DIFFERENCE or
+                (not earlyOK and diff>Flight.TIME_WARNING_DIFFERENCE),
+                diff<-Flight.TIME_ERROR_DIFFERENCE or
+                (not earlyOK and not earlyOnlyWarning
+                 and diff>Flight.TIME_ERROR_DIFFERENCE))
 
     def __init__(self, logger, gui):
@@ -389 +393 @@
         return self.isTimeDifferenceTooMuch(self.bookedFlight.arrivalTime,
                                             self.blockTimeEnd,
-                                            earlyOnlyWarning = True)
+                                            earlyOK = True)
 
     def disconnected(self):