Changeset 349:41c486c8a0b4 for src/mlx/gui

Timestamp:

12/10/12 19:28:32 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

The basic strobe-less RTO handling logic works (#143)

Location:

src/mlx/gui

Files:

• flight.py (modified) (9 diffs)
• gui.py (modified) (3 diffs)
• info.py (modified) (7 diffs)

src/mlx/gui/flight.py

@@ -2007 +2007 @@
                                   xscale = 0.0, yscale = 0.0)
 
-        table = gtk.Table(5, 4)
+        table = gtk.Table(6, 4)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -2086 +2086 @@
         table.attach(self._v2Unit, 3, 4, 4, 5)
 
+        self._rto = gtk.CheckButton(xstr("takeoff_rto"))
+        self._rto.set_use_underline(True)
+        self._rto.set_tooltip_text(xstr("takeoff_rto_tooltip"))
+        self._rto.connect("toggled", self._rtoToggled)
+        table.attach(self._rto, 2, 4, 5, 6, ypadding = 8)
+
         self.addCancelFlightButton()
 
@@ -2116 +2122 @@
         """Get the v2 speed."""
         return self._v2.get_int()
+
+    @property
+    def rtoIndicated(self):
+        """Get whether the pilot has indicated if there was an RTO."""
+        return self._rto.get_active()
 
     def activate(self):
@@ -2140 +2151 @@
         self._v2.set_tooltip_markup(xstr("takeoff_v2_tooltip" + i18nSpeedUnit))
 
+        self._rto.set_active(False)
+        self._rto.set_sensitive(False)
+
         self._button.set_sensitive(False)
         self._forwardAllowed = False
@@ -2154 +2168 @@
         self._vr.reset()
         self._v2.reset()
+
+    def setRTOEnabled(self, enabled):
+        """Set the RTO checkbox enabled or disabled."""
+        if not enabled:
+            self._rto.set_active(False)
+        self._rto.set_sensitive(enabled)
 
     def _updateForwardButton(self):
@@ -2176 +2196 @@
         entry.set_text(entry.get_text().upper())
         self._valueChanged(entry, arg)
+
+    def _rtoToggled(self, button):
+        """Called when the RTO check button is toggled."""
+        self._wizard.rtoToggled(button.get_active())
 
     def _backClicked(self, button):
@@ -2971 +2995 @@
         """Get the V2 speed."""
         return self._takeoffPage.v2
+
+    @property
+    def rtoIndicated(self):
+        """Get whether the pilot has indicated that an RTO has occured."""
+        return self._takeoffPage.rtoIndicated
 
     @property
@@ -3162 +3191 @@
                              callback = callback)
 
+    def updateRTO(self):
+        """Update the RTO state.
+
+        The RTO checkbox will be enabled if the flight has an RTO state and the
+        comments field contains some text."""
+        flight = self.gui.flight
+        rtoEnabled = flight is not None and flight.hasRTO and \
+                     self.gui.hasComments
+        self._takeoffPage.setRTOEnabled(rtoEnabled)
+
+    def rtoToggled(self, indicated):
+        """Called when the RTO indication has changed."""
+        self.gui.rtoToggled(indicated)
+
     def _connectSimulator(self):
         """Connect to the simulator."""
@@ -3179 +3222 @@
 
 #-----------------------------------------------------------------------------
-

src/mlx/gui/gui.py

@@ -303 +303 @@
 
     @property
+    def rtoIndicated(self):
+        """Get whether the pilot has indicated than an RTO has occured."""
+        return self._wizard.rtoIndicated
+
+    @property
     def arrivalRunway(self):
         """Get the arrival runway."""
@@ -341 +346 @@
         """Get the comments."""
         return self._flightInfo.comments
+
+    @property
+    def hasComments(self):
+        """Indicate whether there is a comment."""
+        return self._flightInfo.hasComments
 
     @property
@@ -728 +738 @@
         else:
             callback(self._fleet)
+
+    def updateRTO(self, inLoop = False):
+        """Indicate that the RTO state should be updated."""
+        if inLoop:
+            self._wizard.updateRTO()
+        else:
+            gobject.idle_add(self.updateRTO, True)
+
+    def rtoToggled(self, indicated):
+        """Called when the user has toggled the RTO checkbox."""
+        self._flight.rtoToggled(indicated)
 
     def _fleetResultCallback(self, returned, result):

src/mlx/gui/info.py

@@ -33 +33 @@
                  (const.DELAYCODE_WEATHER, xstr("info_delay_weather")),
                  (const.DELAYCODE_PERSONAL, xstr("info_delay_personal")) ]
-    
+
     @staticmethod
     def _createCommentArea(label):
@@ -50 +50 @@
         alignment.set_padding(padding_top = 4, padding_bottom = 4,
                               padding_left = 8, padding_right = 8)
-        
+
         scroller = gtk.ScrolledWindow()
         # FIXME: these should be constants
@@ -80 +80 @@
         (frame, self._comments) = FlightInfo._createCommentArea(xstr("info_comments"))
         commentsBox.pack_start(frame, True, True, 8)
+        self._comments.get_buffer().connect("changed", self._commentsChanged)
 
         (frame, self._flightDefects) = \
@@ -130 +131 @@
         return text2unicode(buffer.get_text(buffer.get_start_iter(),
                                             buffer.get_end_iter(), True))
-    
+
+    @property
+    def hasComments(self):
+        """Get whether there is any text in comments field."""
+        return self._comments.get_buffer().get_char_count()>0
+
     @property
     def flightDefects(self):
@@ -147 +153 @@
                 codes.append(delayCodes[index][0])
         return codes
-            
+
     def enable(self):
         """Enable the flight info tab."""
@@ -153 +159 @@
         self._flightDefects.set_sensitive(True)
         self._delayTable.set_sensitive(True)
-        
+
     def disable(self):
         """Enable the flight info tab."""
@@ -167 +173 @@
         for widget in self._delayCodeWidgets:
             widget.set_active(False)
+
+    def _commentsChanged(self, textbuffer):
+        """Called when the comments have changed."""
+        self._gui.updateRTO(inLoop = True)