Changes in src/mlx/acft.py [512:46bd71540346:447:3c4f141b2d42]

File:

• src/mlx/acft.py (modified) (10 diffs)

src/mlx/acft.py

@@ -32 +32 @@
 #---------------------------------------------------------------------------------------
 
-# Derate type: no derate possible
-DERATE_NONE = 0
-
-# Derate type: Boeing, i.e. a percentage value.
-# For logging, the percentage value is expected as a string (i.e. whatever the
-# pilot enters into the text field).
-DERATE_BOEING = 1
-
-# Derate type: EPR, i.e. an EPR value.
-# For logging, the EPR value is expected as a string (i.e. whatever the pilot
-# enters into the text field).
-DERATE_EPR = 2
-
-# Derate type: Tupolev, i.e. nominal or takeoff
-# For logging, one of the DERATE_TUPOLEV_xxx values are expected.
-DERATE_TUPOLEV = 3
-
-# Tupolev derate value: nominal
-DERATE_TUPOLEV_NOMINAL = 1
-
-# Tupolev derate value: takeoff
-DERATE_TUPOLEV_TAKEOFF = 2
-
-# Derate type: BAe-146, i.e. enabled or not
-# For logging, a boolean is expected.
-DERATE_B462 = 4
-
-#---------------------------------------------------------------------------------------
-
 class SmoothedValue(object):
     """A smoothed value."""
@@ -232 +203 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this aircraft.
-
-        This default implementation returns DERATE_NONE."""
-        return DERATE_NONE
-
-    def getDerateLine(self, value):
-        """Get the log line for the given derate value.
-
-        It uses the the derate type and produces the standard message for
-        each. This children need not override it, although they can."""
-        dt = self.derateType
-
-        if dt==DERATE_BOEING:
-            return "Derate calculated by the pilot: %s %%" % \
-              ("-" if value is None else value,)
-        elif dt==DERATE_EPR:
-            return "EPR calculated by the pilot: %s" % \
-              ("-" if value is None else value,)
-        elif dt==DERATE_TUPOLEV:
-            return "Thrust setting calculated by the pilot: %s" % \
-              ("-" if value is None else
-               "nominal" if value==DERATE_TUPOLEV_NOMINAL else "takeoff",)
-        elif dt==DERATE_B462:
-            return "Derate setting: %s" % \
-              ("-" if value is None else "enabled" if value else "disabled",)
-        elif dt!=DERATE_NONE:
-            print "mlx.acft.getDerateLine: invalid derate type: " + dt
-
+    def derateLabels(self):
+        """Get the strings related to the derate entry.
+
+        It returns a tuple of two items:
+        - the label before the entry field,
+        - the label after the entry field, which can be None.
+
+        If both labels are None, the derate value will not be logged or
+        queried. This is the default."""
+        return (None, None)
+
+    @property
+    def derateTemplate(self):
+        """Get the template for logging the derate value.
+
+        If it returns None (which is the default), no derate value will be
+        logged."""
         return None
 
@@ -513 +472 @@
         """Log the derate values either newly or by updating the corresponding
         line."""
-        dt = self.derateType
-        if dt==DERATE_NONE:
+        derateTemplate = self.derateTemplate
+        if derateTemplate is None:
             return
 
-        message = self.getDerateLine(self._flight.derate)
-        if message is not None:
-            if self._derateLineID is None:
-                if state is None:
-                    state = self._aircraftState
-                self._derateLineID = \
-                  self.logger.message(state.timestamp, message)
-            else:
-                self.logger.updateLine(self._derateLineID, message)
+        derate = self._flight.derate
+        message = derateTemplate % ("-" if derate is None else derate)
+        if self._derateLineID is None:
+            if state is None:
+                state = self._aircraftState
+            self._derateLineID = \
+                self.logger.message(state.timestamp, message)
+        else:
+            self.logger.updateLine(self._derateLineID, message)
 
     def _logTakeoffAntiIce(self, state = None):
@@ -648 +607 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_BOEING
+    def derateLabels(self):
+        """Get the derate strings for this type."""
+        return (xstr("takeoff_derate_boeing"), "%")
+
+    @property
+    def derateTemplate(self):
+        """Get the derate template for this aicraft type."""
+        return "Derate calculated by the pilot: %s %%"
 
     # def _appendSpeedChecker(self):
@@ -777 +741 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_BOEING
+    def derateLabels(self):
+        """Get the derate strings for this type."""
+        return (xstr("takeoff_derate_boeing"), "%")
+
+    @property
+    def derateTemplate(self):
+        """Get the derate template for this aicraft type."""
+        return "Derate calculated by the pilot: %s %%"
 
 #---------------------------------------------------------------------------------------
@@ -850 +819 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_EPR
+    def derateLabels(self):
+        """Get the derate strings for this type."""
+        return ("EPR", None)
+
+    @property
+    def derateTemplate(self):
+        """Get the derate template for this aicraft type."""
+        return "EPR calculated by the pilot: %s"
 
 #---------------------------------------------------------------------------------------
@@ -907 +881 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_TUPOLEV
+    def derateLabels(self):
+        """Get the derate strings for this type."""
+        return (xstr("takeoff_derate_tupolev"), None)
+
+    @property
+    def derateTemplate(self):
+        """Get the derate template for this aicraft type."""
+        return "Nominal/takeoff power calculated by the pilot: %s"
 
     @property
@@ -960 +939 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_TUPOLEV
+    def derateLabels(self):
+        """Get the derate strings for this type."""
+        return (xstr("takeoff_derate_tupolev"), None)
+
+    @property
+    def derateTemplate(self):
+        """Get the derate template for this aicraft type."""
+        return "Nominal/takeoff power calculated by the pilot: %s"
 
     def _appendLightsLoggers(self):
@@ -1006 +990 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_TUPOLEV
+    def derateLabels(self):
+        """Get the derate strings for this type."""
+        return (xstr("takeoff_derate_tupolev"), None)
+
+    @property
+    def derateTemplate(self):
+        """Get the derate template for this aicraft type."""
+        return "Nominal/takeoff power calculated by the pilot: %s"
 
     def _appendLightsLoggers(self):
@@ -1049 +1038 @@
 
     @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_B462
+    def derateLabels(self):
+        """Get the derate strings for this type."""
+        return (xstr("takeoff_derate_b462"), None)
+
+    @property
+    def derateTemplate(self):
+        """Get the derate template for this aicraft type."""
+        return "Derate enabled: %s"
 
 #---------------------------------------------------------------------------------------