Changeset 604:0ec6a6f58f08 for src/mlx

Timestamp:

03/01/15 16:53:08 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added a new widget to list the faults and provide space for the user to enter an explanation (re #248).

Location:

src/mlx

Files:

• gui/common.py (modified) (4 diffs)
• gui/faultexplain.py (added)
• gui/gui.py (modified) (2 diffs)
• gui/info.py (modified) (8 diffs)
• logger.py (modified) (2 diffs)

src/mlx/gui/common.py

@@ -57 +57 @@
     DIALOG_MODAL = gtk.DIALOG_MODAL
     WRAP_WORD = gtk.WRAP_WORD
+
     JUSTIFY_CENTER = gtk.JUSTIFY_CENTER
+    JUSTIFY_LEFT = gtk.JUSTIFY_LEFT
 
     CONTROL_MASK = gdk.CONTROL_MASK
@@ -78 +80 @@
 
     POLICY_AUTOMATIC = gtk.POLICY_AUTOMATIC
+    POLICY_NEVER = gtk.POLICY_NEVER
+    POLICY_ALWAYS = gtk.POLICY_ALWAYS
 
     WEIGHT_NORMAL = pango.WEIGHT_NORMAL
@@ -131 +135 @@
     WRAP_WORD = gtk.WrapMode.WORD
     JUSTIFY_CENTER = gtk.Justification.CENTER
+    JUSTIFY_LEFT = gtk.Justification.LEFT
 
     CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
@@ -151 +156 @@
 
     POLICY_AUTOMATIC = gtk.PolicyType.AUTOMATIC
+    POLICY_NEVER = gtk.PolicyType.NEVER
+    POLICY_ALWAYS = gtk.PolicyType.ALWAYS
 
     WEIGHT_NORMAL = pango.Weight.NORMAL

src/mlx/gui/gui.py

@@ -396 +396 @@
     def flightDefects(self):
         """Get the flight defects."""
-        return self._flightInfo.flightDefects
+        return self._flightInfo.faultsAndExplanations
 
     @property
@@ -585 +585 @@
         """Remove the flight log line with the given index."""
         gobject.idle_add(self._removeFlightLogLine, index)
+
+    def addFault(self, id, timestampString, text):
+        """Add a fault to the list of faults."""
+        faultText = formatFlightLogLine(timestampString, text).strip()
+        self._flightInfo.addFault(id, faultText)
+
+    def updateFault(self, id, timestampString, text):
+        """Update a fault in the list of faults."""
+        faultText = formatFlightLogLine(timestampString, text).strip()
+        self._flightInfo.updateFault(id, faultText)
+
+    def clearFault(self, id):
+        """Clear a fault in the list of faults."""
+        self._flightInfo.clearFault(id)
 
     def _removeFlightLogLine(self, index):

src/mlx/gui/info.py

@@ -3 +3 @@
 
 from mlx.gui.delaycodes import DelayCodeTable
+from mlx.gui.faultexplain import FaultExplainWidget
 
 from mlx.i18n import xstr
@@ -14 +15 @@
 #
 # This module implements to \ref FlightInfo class, which is the widget for the
-# extra information related to the flight. It contains text areas for the
-# comments and the flight defects at the top next to each other, and the frame
-# for the delay codes at the bottom in the centre.
+# extra information related to the flight. It contains a text area for the
+# comments, the fault list widget, and the frame for the delay codes at the
+# bottom in the centre.
 
 #------------------------------------------------------------------------------
@@ -61 +62 @@
                                                 xscale = 1.0, yscale = 1.0)
         commentsBox = gtk.HBox()
+        commentsBox.set_homogeneous(True)
 
         (frame, self._comments) = FlightInfo._createCommentArea(xstr("info_comments"))
@@ -66 +68 @@
         self._comments.get_buffer().connect("changed", self._commentsChanged)
 
-        (frame, self._flightDefects) = \
-             FlightInfo._createCommentArea(xstr("info_defects"))
-        commentsBox.pack_start(frame, True, True, 8)
+        self._faultExplainWidget = FaultExplainWidget()
+        commentsBox.pack_start(self._faultExplainWidget, True, True, 8)
 
         self._commentsAlignment.add(commentsBox)
@@ -113 +114 @@
 
     @property
-    def flightDefects(self):
-        """Get the flight defects."""
-        buffer = self._flightDefects.get_buffer()
-        return text2unicode(buffer.get_text(buffer.get_start_iter(),
-                                            buffer.get_end_iter(), True))
+    def faultsAndExplanations(self):
+        """Get the faults and explanations as HTML."""
+        return self._faultExplainWidget.html
 
     @property
@@ -129 +128 @@
         return self._delayCodeTable.hasDelayCode
 
+    def addFault(self, id, faultText):
+        """Add a fault to the list of faults."""
+        self._faultExplainWidget.addFault(id, faultText)
+
+    def updateFault(self, id, faultText):
+        """Update a fault to the list of faults."""
+        self._faultExplainWidget.updateFault(id, faultText)
+
+    def clearFault(self, id):
+        """Clear a fault to the list of faults."""
+        self._faultExplainWidget.clearFault(id)
+
     def enable(self, aircraftType):
         """Enable the flight info tab."""
         self._comments.set_sensitive(True)
-        self._flightDefects.set_sensitive(True)
+        self._faultExplainWidget.set_sensitive(True)
         self._delayCodeTable.setType(aircraftType)
         self._delayWindow.set_sensitive(True)
@@ -140 +151 @@
         """Enable the flight info tab."""
         self._comments.set_sensitive(False)
-        self._flightDefects.set_sensitive(False)
+        self._faultExplainWidget.set_sensitive(False)
         self._delayWindow.set_sensitive(False)
         self._delayCodeTable.setStyle()
@@ -147 +158 @@
         """Reset the flight info tab."""
         self._comments.get_buffer().set_text("")
-        self._flightDefects.get_buffer().set_text("")
+        self._faultExplainWidget.reset()
         self._delayCodeTable.reset()
 

src/mlx/logger.py

@@ -284 +284 @@
                                         faultScore = score)
             self._updateEntry(id, newEntry)
+            if latestEntry.isFault:
+                self._output.updateFault(id, newEntry.timestampString, text)
+            else:
+                self._output.addFault(id, newEntry.timestampString, text)
         elif updateID is not None:
             id = updateID
-            newEntry = self._entries[id].copy(timestamp = timestamp,
-                                              text = text, faultID = faultID,
-                                              faultScore = score)
+            oldEntry = self._entries[id]
+            newEntry = oldEntry.copy(timestamp = timestamp,
+                                     text = text, faultID = faultID,
+                                     faultScore = score)
             self._updateEntry(id, newEntry)
+            if oldEntry.isFault:
+                self._output.updateFault(id, newEntry.timestampString, text)
+            else:
+                self._output.addFault(id, newEntry.timestampString, text)
         else:
-            id = self._addEntry(Logger.Entry(timestamp, text, faultID = faultID,
-                                             faultScore = score))
+            entry = Logger.Entry(timestamp, text, faultID = faultID,
+                                 faultScore = score)
+            id = self._addEntry(entry)
+            self._output.addFault(id, entry.timestampString, text)
 
         if updateID is None:
@@ -328 +339 @@
         newEntry = self._entries[id].copy(text = text, clearFault = True)
         self._updateEntry(id, newEntry)
+        self._output.clearFault(id)
 
     def _addEntry(self, entry):