Changeset 24:cd794f1c6ff0

Timestamp:

02/15/12 20:03:48 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The logger is now reset when connecting.

Location:

src

Files:

• logger.py (modified) (2 diffs)
• mlx.py (modified) (3 diffs)

src/logger.py

@@ -37 +37 @@
         """Get the string representation of the given timestamp."""
         return time.strftime("%H:%M:%S", time.gmtime(timestamp))
+
+    def reset(self):
+        """Reset the logger.
+
+        The faults logged so far will be cleared."""
+        self._faults.clear()
                 
     def message(self, timestamp, msg):
@@ -58 +64 @@
         s = Logger._stages[stage] if stage in Logger._stages else "<Unknown>"
         self.message(timestamp, "--- %s ---" % (s,))
+        if stage==const.STAGE_END:
+            totalScore = 100
+            for (id, score) in self._faults.iteritems():
+                totalScore -= score
+            self.untimedMessage("Score: %.0f" % (totalScore,))
         
     def fault(self, faultID, timestamp, what, score):

src/mlx.py

@@ -130 +130 @@
         """Callback for the connection button."""
         if self._connectButton.get_active():
+            self._logger.reset()
             self._flight = flight.Flight(self._logger)
 
@@ -141 +142 @@
 
             self._flight.zfw = self._zfwSpinButton.get_value_as_int()
-
-            print self._flight.aircraft, self._flight.cruiseAltitude, self._flight.zfw
 
             if self._simulator is None:
@@ -357 +356 @@
         table.attach(self._groundSpeed, 5, 6, 2, 3)
 
-        (label, self._radioAltitude) = self._createLabeledEntry("Radio alt.:", 4)
+        (label, self._radioAltitude) = self._createLabeledEntry("Radio alt.:", 6)
         table.attach(label, 6, 7, 2, 3)
         table.attach(self._radioAltitude, 7, 8, 2, 3)
 
-        (label, self._altitude) = self._createLabeledEntry("Altitude:", 4)
+        (label, self._altitude) = self._createLabeledEntry("Altitude:", 6)
         table.attach(label, 8, 9, 2, 3)
         table.attach(self._altitude, 9, 10, 2, 3)