Changeset 539:750f64278751 for src/mlx/acft.py

Timestamp:

09/18/13 04:52:50 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

The no-strobe speed checker also works for models without strobe and transponder (re #211)

File:

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

src/mlx/acft.py

@@ -113 +113 @@
         self.reverseMinSpeed = 60
 
+        self.needNoStrobeSpeedCheck = False
+
         self._checkers = []
 
@@ -178 +180 @@
         self._checkers.append(checks.PayloadChecker())
 
-        self._appendSpeedChecker()
+        self._checkers.append(checks.NoStrobeSpeedChecker())
+        self._checkers.append(checks.SpeedChecker())
         self._checkers.append(checks.VSChecker())
 
@@ -480 +483 @@
         self._checkers.append(checks.StrobeLightsChecker())
 
-    def _appendSpeedChecker(self):
-        """Append the speed checker.
-
-        This default implementation used the SpeedChecker."""
-        self._checkers.append(checks.SpeedChecker())
-
     def _speedToLog(self, speed):
         """Convert the given speed (being either None or expressed in the
@@ -651 +648 @@
         """Get the derate type for this type."""
         return DERATE_BOEING
-
-    # def _appendSpeedChecker(self):
-    #     """Append the NoStrobeSpeedChecker to the checkers.
-
-    #     FOR TESTING ONLY, THIS FUNCTION SHOULD NORMALLY BE COMMENTED OUT!!!"""
-    #     self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------
@@ -906 +897 @@
         self.reverseMinSpeed = 50
 
+        self.needNoStrobeSpeedCheck = True
+
     @property
     def derateType(self):
@@ -927 +920 @@
         self._checkers.append(checks.LandingLightsChecker())
         self._checkers.append(checks.NavLightsChecker())
-
-    def _appendSpeedChecker(self):
-        """Append the NoStrobeSpeedChecker to the checkers."""
-        self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------
@@ -954 +943 @@
         self.reverseMinSpeed = 50
 
+        self.needNoStrobeSpeedCheck = True
+
     @property
     def speedInKnots(self):
@@ -975 +966 @@
         self._checkers.append(checks.LandingLightsChecker())
         self._checkers.append(checks.NavLightsChecker())
-
-    def _appendSpeedChecker(self):
-        """Append the NoStrobeSpeedChecker to the checkers."""
-        self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------
@@ -1000 +987 @@
                                  35 : 135 }
 
+        self.needNoStrobeSpeedCheck = True
+
     @property
     def speedInKnots(self):
@@ -1021 +1010 @@
         self._checkers.append(checks.LandingLightsChecker())
         self._checkers.append(checks.NavLightsChecker())
-
-    def _appendSpeedChecker(self):
-        """Append the NoStrobeSpeedChecker to the checkers."""
-        self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------