Changeset 586:6e5ba20962e3 for src/mlx

Timestamp:

12/21/14 14:33:17 (10 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The deprature METAR is displayed on the takeoff page as well and that and the one on the briefing page are kept in sync (re #235)

File:

• src/mlx/gui/flight.py (modified) (26 diffs)

src/mlx/gui/flight.py

@@ -1938 +1938 @@
                                   else gtk.POLICY_AUTOMATIC)
 
-        self._uppercasingMETAR = False
+        self._updatingMETAR = False
 
         self._metar = gtk.TextView()
@@ -1968 +1968 @@
 
     def setMETAR(self, metar):
-        """Set the metar."""
+        """Set the METAR."""
         self._metar.get_buffer().set_text(metar)
         self.metarEdited = False
+
+    def changeMETAR(self, metar):
+        """Change the METAR as a result of an edit on one of the other
+        pages."""
+        self._updatingMETAR = True
+        self._metar.get_buffer().set_text(metar)
+        self._updatingMETAR = False
+        self.metarEdited = True
 
     def activate(self):
@@ -2003 +2011 @@
         self._metarFrame.set_label(xstr("briefing_metar_template") % (icao,))
         buffer = self._metar.get_buffer()
+        self._updatingMETAR = True
         if metar is None:
-            #buffer.set_text(xstr("briefing_metar_failed"))
             buffer.set_text("")
             self.setHelp(xstr("briefing_help_nometar"))
         else:
             buffer.set_text(metar)
+        self._updatingMETAR = False
         self._updateButton()
 
@@ -2034 +2043 @@
     def _metarChanged(self, buffer):
         """Called when the METAR has changed."""
-        if not self._uppercasingMETAR:
+        print "BriefingPage.metarChanged", self._updatingMETAR
+        if not self._updatingMETAR:
             self.metarEdited = True
             self._updateButton()
+            metar = buffer.get_text(buffer.get_start_iter(),
+                                buffer.get_end_iter(), True)
+            self._wizard.metarChanged(metar, self)
 
     def _metarInserted(self, textBuffer, iter, text, length):
@@ -2042 +2055 @@
 
         It uppercases all characters."""
-        if not self._uppercasingMETAR:
-            self._uppercasingMETAR = True
+        print "BriefingPage.metarInserted", self._updatingMETAR
+        if not self._updatingMETAR:
+            self._updatingMETAR = True
 
             iter1 = iter.copy()
@@ -2051 +2065 @@
             textBuffer.insert(iter, text.upper())
 
-            self._uppercasingMETAR = False
+            self._updatingMETAR = False
 
     def _updateButton(self):
@@ -2077 +2091 @@
                                   xscale = 0.0, yscale = 0.0)
 
-        table = gtk.Table(8, 4)
+        table = gtk.Table(9, 24)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -2084 +2098 @@
         self.setMainWidget(alignment)
 
+        row = 0
+
+        label = gtk.Label(xstr("takeoff_metar"))
+        label.set_use_underline(True)
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, row, row+1)
+
+        self._metar = gtk.Entry()
+        self._metar.set_width_chars(40)
+        self._metar.connect("changed", self._metarChanged)
+        self._metar.connect_after("insert-text", self._metarInserted)
+        table.attach(self._metar, 1, 24, row, row+1)
+        label.set_mnemonic_widget(self._metar)
+
+        self._updatingMETAR = False
+
+        row += 1
+
         label = gtk.Label(xstr("takeoff_runway"))
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
-        table.attach(label, 0, 1, 0, 1)
+        table.attach(label, 0, 1, row, row+1)
 
         self._runway = gtk.Entry()
@@ -2093 +2125 @@
         self._runway.set_tooltip_text(xstr("takeoff_runway_tooltip"))
         self._runway.connect("changed", self._upperChanged)
-        table.attach(self._runway, 1, 3, 0, 1)
+        table.attach(self._runway, 1, 3, row, row+1)
         label.set_mnemonic_widget(self._runway)
+
+        row += 1
 
         label = gtk.Label(xstr("takeoff_sid"))
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
-        table.attach(label, 0, 1, 1, 2)
+        table.attach(label, 0, 1, row, row+1)
 
         self._sid = gtk.Entry()
@@ -2105 +2139 @@
         self._sid.set_tooltip_text(xstr("takeoff_sid_tooltip"))
         self._sid.connect("changed", self._upperChanged)
-        table.attach(self._sid, 1, 3, 1, 2)
+        table.attach(self._sid, 1, 3, row, row+1)
         label.set_mnemonic_widget(self._sid)
+
+        row += 1
 
         label = gtk.Label(xstr("takeoff_v1"))
@@ -2112 +2148 @@
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
-        table.attach(label, 0, 1, 2, 3)
+        table.attach(label, 0, 1, row, row+1)
 
         self._v1 = IntegerEntry()
@@ -2118 +2154 @@
         self._v1.set_tooltip_markup(xstr("takeoff_v1_tooltip_knots"))
         self._v1.connect("integer-changed", self._valueChanged)
-        table.attach(self._v1, 2, 3, 2, 3)
+        table.attach(self._v1, 2, 3, row, row+1)
         label.set_mnemonic_widget(self._v1)
 
         self._v1Unit = gtk.Label(xstr("label_knots"))
         self._v1Unit.set_alignment(0.0, 0.5)
-        table.attach(self._v1Unit, 3, 4, 2, 3)
+        table.attach(self._v1Unit, 3, 4, row, row+1)
+
+        row += 1
 
         label = gtk.Label(xstr("takeoff_vr"))
@@ -2129 +2167 @@
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
-        table.attach(label, 0, 1, 3, 4)
+        table.attach(label, 0, 1, row, row+1)
 
         self._vr = IntegerEntry()
@@ -2135 +2173 @@
         self._vr.set_tooltip_markup(xstr("takeoff_vr_tooltip_knots"))
         self._vr.connect("integer-changed", self._valueChanged)
-        table.attach(self._vr, 2, 3, 3, 4)
+        table.attach(self._vr, 2, 3, row, row+1)
         label.set_mnemonic_widget(self._vr)
 
         self._vrUnit = gtk.Label(xstr("label_knots"))
         self._vrUnit.set_alignment(0.0, 0.5)
-        table.attach(self._vrUnit, 3, 4, 3, 4)
+        table.attach(self._vrUnit, 3, 4, row, row+1)
+
+        row += 1
 
         label = gtk.Label(xstr("takeoff_v2"))
@@ -2146 +2186 @@
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
-        table.attach(label, 0, 1, 4, 5)
+        table.attach(label, 0, 1, row, row+1)
 
         self._v2 = IntegerEntry()
@@ -2152 +2192 @@
         self._v2.set_tooltip_markup(xstr("takeoff_v2_tooltip_knots"))
         self._v2.connect("integer-changed", self._valueChanged)
-        table.attach(self._v2, 2, 3, 4, 5)
+        table.attach(self._v2, 2, 3, row, row+1)
         label.set_mnemonic_widget(self._v2)
 
         self._v2Unit = gtk.Label(xstr("label_knots"))
         self._v2Unit.set_alignment(0.0, 0.5)
-        table.attach(self._v2Unit, 3, 4, 4, 5)
+        table.attach(self._v2Unit, 3, 4, row, row+1)
+
+        row += 1
 
         self._derateType = acft.DERATE_NONE
@@ -2165 +2207 @@
         self._derateLabel.set_markup(xstr("takeoff_derate_tupolev"))
         self._derateLabel.set_alignment(0.0, 0.5)
-        table.attach(self._derateLabel, 0, 1, 5, 6)
+        table.attach(self._derateLabel, 0, 1, row, row+1)
 
         self._derate = gtk.Alignment()
-        table.attach(self._derate, 2, 4, 5, 6)
+        table.attach(self._derate, 2, 4, row, row+1)
         self._derateWidget = None
         self._derateEntry = None
@@ -2174 +2216 @@
         self._derateButtons = None
 
+        row += 1
+
         self._antiIceOn = gtk.CheckButton(xstr("takeoff_antiice"))
         self._antiIceOn.set_use_underline(True)
         self._antiIceOn.set_tooltip_text(xstr("takeoff_antiice_tooltip"))
-        table.attach(self._antiIceOn, 2, 4, 6, 7)
+        table.attach(self._antiIceOn, 2, 4, row, row+1)
+
+        row += 1
 
         self._rto = gtk.CheckButton(xstr("takeoff_rto"))
@@ -2183 +2229 @@
         self._rto.set_tooltip_text(xstr("takeoff_rto_tooltip"))
         self._rto.connect("toggled", self._rtoToggled)
-        table.attach(self._rto, 2, 4, 7, 8, ypadding = 8)
+        table.attach(self._rto, 2, 4, row, row+1, ypadding = 8)
 
         self.addCancelFlightButton()
@@ -2190 +2236 @@
 
         self._button = self.addNextButton(clicked = self._forwardClicked)
+
+        self._active = False
 
     @property
@@ -2255 +2303 @@
         print "TakeoffPage.activate"
 
+        self._updatingMETAR = True
+        self._metar.get_buffer().set_text(self._wizard.departureMETAR, -1)
+        self._updatingMETAR = False
+
         self._runway.set_text("")
         self._runway.set_sensitive(True)
@@ -2286 +2338 @@
         self._forwardAllowed = False
 
+        self._active = True
+
     def allowForward(self):
         """Allow going to the next page."""
@@ -2302 +2356 @@
         self._hasDerate = False
         self._antiIceOn.set_active(False)
+        self._active = False
 
     def setRTOEnabled(self, enabled):
@@ -2308 +2363 @@
             self._rto.set_active(False)
         self._rto.set_sensitive(enabled)
+
+    def changeMETAR(self, metar):
+        """Change the METAR as a result of an edit on one of the other
+        pages."""
+        if self._active:
+            print "TakeoffPage.changeMETAR"
+            self._updatingMETAR = True
+            self._metar.get_buffer().set_text(metar, -1)
+            self._updatingMETAR = False
 
     def _updateForwardButton(self):
@@ -2450 +2514 @@
             self._derateLabel.set_text("")
             self._derateLabel.set_sensitive(False)
+
+    def _metarChanged(self, entry):
+        """Called when the METAR has changed."""
+        print "TakeoffPage.metarChanged", self._updatingMETAR
+        if not self._updatingMETAR:
+            self._updateForwardButton()
+            self._wizard.metarChanged(entry.get_text(), self)
+
+    def _metarInserted(self, entry, text, length, position):
+        """Called when new characters are inserted into the METAR.
+
+        It uppercases all characters."""
+        print "TakeoffPage.metarInserted", self._updatingMETAR
+        if not self._updatingMETAR:
+            self._updatingMETAR = True
+
+            position = entry.get_position()
+            entry.delete_text(position, position + length)
+            entry.insert_text(text.upper(), position)
+
+            self._updatingMETAR = False
 
 #-----------------------------------------------------------------------------
@@ -3729 +3814 @@
         """Called when the cruise level is changed."""
         return self.gui.cruiseLevelChanged()
+
+    def metarChanged(self, metar, originator):
+        """Called when a METER is changed on on of the pages.
+
+        originator is the page that originated the changed. It will be used to
+        determine which METAR (departure or arrival) has changed."""
+        metar = metar.upper()
+        if originator in [self._departureBriefingPage, self._takeoffPage]:
+            self._departureMETARChanged(metar, originator)
+        else:
+            self._arrivalMETARChanged(metar, originator)
+
+    def _departureMETARChanged(self, metar, originator):
+        """Called when the departure METAR has been edited on one of the
+        pages.
+
+        originator is the page that originated the change. It will not be
+        called to set the METAR, while others will be."""
+        for page in [self._departureBriefingPage, self._takeoffPage]:
+            if page is not originator:
+                page.changeMETAR(metar)
+
+    def _arrivalMETARChanged(self, metar, originator):
+        """Called when the arrival METAR has been edited on one of the
+        pages.
+
+        originator is the page that originated the change. It will not be
+        called to set the METAR, while others will be."""
+        for page in [self._arrivalBriefingPage]:
+            if page is not originator:
+                page.changeMETAR(metar)
 
     def _loginResultCallback(self, returned, result):