Changeset 117:af3d52b9adc4

Timestamp:

04/28/12 12:25:48 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Implemented the weight help tab

Location:

src/mlx

Files:

• acft.py (modified) (1 diff)
• fsuipc.py (modified) (2 diffs)
• gui/flight.py (modified) (3 diffs)
• gui/gui.py (modified) (6 diffs)
• gui/weighthelp.py (added)
• i18n.py (modified) (5 diffs)
• pyuipc_sim.py (modified) (4 diffs)

src/mlx/acft.py

@@ -28 +28 @@
         self._v1r2LineIndex = None
         self._vrefLineIndex = None
+
+        self.humanWeight = 82.0
 
         self._checkers = []

src/mlx/fsuipc.py

@@ -531 +531 @@
         self._handler.requestRead([(0x3bfc, "d")], self._handleZFW, extra = callback)
 
+    def requestWeights(self, callback):
+        """Request the following weights: DOW, ZFW, payload.
+
+        These values will be passed to the callback function in this order, as
+        separate arguments."""        
+        self._handler.requestRead([(0x13fc, "d")], self._handlePayloadCount,
+                                  extra = callback)
+
     def requestTime(self, callback):
         """Request the time from the simulator."""
@@ -737 +745 @@
         """Callback for a time retrieval request."""
         callback(Simulator._getTimestamp(data))
+
+    def _handlePayloadCount(self, data, callback):
+        """Callback for the payload count retrieval request."""
+        payloadCount = data[0]
+        data = [(0x3bfc, "d"), (0x30c0, "f")]
+        for i in range(0, payloadCount):
+            data.append((0x1400 + i*48, "f"))
+        
+        self._handler.requestRead(data, self._handleWeights,
+                                  extra = callback)
+
+    def _handleWeights(self, data, callback):
+        """Callback for the weights retrieval request."""
+        zfw = data[0] * const.LBSTOKG / 256.0
+        grossWeight = data[1] * const.LBSTOKG
+        payload = sum(data[2:]) * const.LBSTOKG
+        dow = zfw - payload
+        callback(dow, payload, zfw, grossWeight)
                                                   
 #------------------------------------------------------------------------------

src/mlx/gui/flight.py

@@ -799 +799 @@
         """Finalize the payload page."""
         self._cargoWeight.set_sensitive(False)
+        self._wizard.gui.initializeWeightHelp()
 
     def calculateZFW(self):
@@ -1908 +1909 @@
         self._payloadPage = PayloadPage(self) 
         self._pages.append(self._payloadPage)
+        self._payloadIndex = len(self._pages)
         self._pages.append(TimePage(self))
         self._routePage = RoutePage(self)
@@ -1915 +1917 @@
         self._arrivalBriefingPage = BriefingPage(self, False)
         self._pages.append(self._arrivalBriefingPage)
+        self._arrivalBriefingIndex = len(self._pages)
         self._takeoffPage = TakeoffPage(self) 
         self._pages.append(self._takeoffPage)

src/mlx/gui/gui.py

@@ -8 +8 @@
 from mlx.gui.flight import Wizard
 from mlx.gui.monitor import MonitorWindow
+from mlx.gui.weighthelp import WeightHelp
 
 import mlx.const as const
@@ -88 +89 @@
         self._flightInfo.disable()
 
+        self._weightHelp = WeightHelp(self)
+        label = gtk.Label(xstr("tab_weight_help"))
+        label.set_use_underline(True)
+        label.set_tooltip_text(xstr("tab_weight_help_tooltip"))
+        self._notebook.append_page(self._weightHelp, label)
+        
         (logWidget, self._logView)  = self._buildLogWidget()
         label = gtk.Label(xstr("tab_log"))
@@ -112 +119 @@
         window.show_all()
         self._wizard.grabDefault()
+        self._weightHelp.reset()
+        self._weightHelp.disable()
 
         self._mainWindow = window
@@ -353 +362 @@
         self.resetFlightStatus()
 
+        self._weightHelp.reset()
+        self._weightHelp.disable()
         self._wizard.reset()
         self._notebook.set_current_page(0)
@@ -518 +529 @@
         """Begin a period of background processing."""
         self._wizard.set_sensitive(False)
+        self._weightHelp.set_sensitive(False)
         self._mainWindow.get_window().set_cursor(self._busyCursor)
         self._statusbar.updateBusyState(message)
@@ -524 +536 @@
         """End a period of background processing."""
         self._mainWindow.get_window().set_cursor(None)
+        self._weightHelp.set_sensitive(True)
         self._wizard.set_sensitive(True)
         self._statusbar.updateBusyState(None)
+
+    def initializeWeightHelp(self):
+        """Initialize the weight help tab."""
+        self._weightHelp.reset()
+        self._weightHelp.enable()
 
     def _writeStdIO(self):

src/mlx/i18n.py

@@ -139 +139 @@
         self.add("tab_flight_info", "Flight _info")
         self.add("tab_flight_info_tooltip", "Further information regarding the flight")
+        self.add("tab_weight_help", "_Help")
+        self.add("tab_weight_help_tooltip", "Help to calculate the weights")
         self.add("tab_log", "_Log")
         self.add("tab_log_tooltip",
                  "The log of your flight that will be sent to the MAVA website")
+        self.add("tab_gates", "_Gates")        
         self.add("tab_debug_log", "_Debug log")
         self.add("tab_debug_log_tooltip", "Log with debugging information.")
-        self.add("tab_help", "_Help")
-        self.add("tab_gates", "_Gates")
 
         self.add("conn_failed", "Cannot connect to the simulator.")
@@ -475 +476 @@
         self.add("update_nothing", "There was nothing to update")
         self.add("update_failed", "Failed, see the debug log for details.")
+
+        self.add("weighthelp_usinghelp", "_Using help")
+        self.add("weighthelp_usinghelp_tooltip",
+                 "If you check this, some help will be displayed on how "
+                 "to calculate the payload weight for your flight. "
+                 "Note, that the usage of this facility will be logged.")
+        self.add("weighthelp_header_calculated", "Requested/\ncalculated")
+        self.add("weighthelp_header_simulator", "Simulator\ndata")
+        self.add("weighthelp_header_simulator_tooltip",
+                 "Click this button to retrieve the weight values from the "
+                 "simulator, which will be displayed below. If a value is "
+                 "within 10% of the tolerance, it is displayed in "
+                 '<b><span foreground="darkgreen">green</span></b>, '
+                 "if it is out of the tolerance, it is displayed in "
+                 '<b><span foreground="red">red</span></b>, '
+                 "otherwise in"
+                 '<b><span foreground="orange">yellow</span></b>.')
+        self.add("weighthelp_crew", "Crew (%s):")
+        self.add("weighthelp_pax", "Passengers (%s):")
+        self.add("weighthelp_baggage", "Baggage:")
+        self.add("weighthelp_cargo", "Cargo:")
+        self.add("weighthelp_mail", "Mail:")
+        self.add("weighthelp_payload", "Payload:")
+        self.add("weighthelp_dow", "DOW:")
+        self.add("weighthelp_zfw", "ZFW:")
+        self.add("weighthelp_gross", "Gross weight:")
+        self.add("weighthelp_mzfw", "MZFW:")
+        self.add("weighthelp_mtow", "MTOW:")
+        self.add("weighthelp_mlw", "MLW:")
+        self.add("weighthelp_busy", "Querying weight data...")
                  
 #------------------------------------------------------------------------------
@@ -501 +532 @@
         self.add("tab_flight_info", "Járat _info")
         self.add("tab_flight_info_tooltip", "Egyéb információk a járat teljesítésével kapcsolatban")
+        self.add("tab_weight_help", "_Segítség")
+        self.add("tab_weight_help_tooltip", "Segítség a súlyszámításhoz")
         self.add("tab_log", "_Napló")
         self.add("tab_log_tooltip",
@@ -507 +540 @@
         self.add("tab_debug_log_tooltip",
                  "Hibakereséshez használható információkat tartalmazó napló.")
-        self.add("tab_help", "_Segítség")
         self.add("tab_gates", "_Kapuk")        
 
@@ -842 +874 @@
         self.add("update_failed", "Nem sikerült, a részleteket lásd a debug naplóban.")
 
+        self.add("weighthelp_usinghelp", "_Használom a segítséget")
+        self.add("weighthelp_usinghelp_tooltip",
+                 "Ha bejelölöd, az alábbiakban kapsz egy kis segítséget "
+                 "a járathoz szükséges hasznos teher megállapításához. "
+                 "Ha igénybe veszed ezt a szolgáltatást, ez a tény "
+                 "a naplóba bekerül.")
+        self.add("weighthelp_header_calculated", "Elvárt/\nszámított")
+        self.add("weighthelp_header_simulator", "Szimulátor\nadatok")
+        self.add("weighthelp_header_simulator_tooltip",
+                 "Kattints erre a gombra a súlyadatoknak a szimulátortól "
+                 "való lekérdezéséhez. Az értékek lent jelennek meg. Ha "
+                 "egy érték a tűrés 10%-án belül van, akkor az "
+                 '<b><span foreground="darkgreen">zöld</span></b> '
+                 "színnel jelenik meg. Ha nem fér bele a tűrésbe, akkor "
+                 '<b><span foreground="red">piros</span></b>, '
+                 "egyébként "
+                 '<b><span foreground="orange">sárga</span></b> '
+                 "színben olvasható.")
+        self.add("weighthelp_crew", "Legénység (%s):")
+        self.add("weighthelp_pax", "Utasok (%s):")
+        self.add("weighthelp_baggage", "Poggyász:")
+        self.add("weighthelp_cargo", "Teher:")
+        self.add("weighthelp_mail", "Posta:")
+        self.add("weighthelp_payload", "Hasznos teher:")
+        self.add("weighthelp_dow", "DOW:")
+        self.add("weighthelp_zfw", "ZFW:")
+        self.add("weighthelp_gross", "Teljes tömeg:")
+        self.add("weighthelp_mzfw", "MZFW:")
+        self.add("weighthelp_mtow", "MTOW:")
+        self.add("weighthelp_mlw", "MLW:")
+        self.add("weighthelp_busy", "A tömegadatok lekérdezése...")
+
 #------------------------------------------------------------------------------
 

src/mlx/pyuipc_sim.py

@@ -243 +243 @@
         self.n1 = [0.0, 0.0, 0.0]
         self.throttles = [0.0, 0.0, 0.0]
+
+        self.payloadCount = 1
+        self.payload = []
+        for i in range(0, 61): self.payload.append(0.0)
 
     def read(self, offset):
@@ -402 +406 @@
         elif offset==0x1260:       # External 2 tank capacity
             return self._getFuelCapacity(self.FUEL_EXTERNAL_2)
+        elif offset==0x13fc:       # The number of the payload stations
+            return self.payloadCount
+        elif offset>=0x1400 and offset<=0x1f40 and \
+             ((offset-0x1400)%48)==0: # Payload
+            return self.payload[ (offset - 0x1400) / 48 ]
         elif offset==0x2000:       # Engine #1 N1
             return self.n1[self.ENGINE_1]
@@ -581 +590 @@
         elif offset==0x1260:       # External 2 tank capacity
             self._setFuelCapacity(self.FUEL_EXTERNAL_2, value)
+        elif offset==0x13fc:       # The number of the payload stations
+            self.payloadCount = int(value)
+        elif offset>=0x1400 and offset<=0x1f40 and \
+             ((offset-0x1400)%48)==0: # Payload
+            self.payload[ (offset - 0x1400) / 48 ] = value
         elif offset==0x2000:       # Engine #1 N1
             self.n1[self.ENGINE_1] = value
@@ -1114 +1128 @@
                                                               100.0/1609.344))
                                                             
+        self._valueHandlers["payloadCount"] = (0x13fc, "d",
+                                               lambda value: value,
+                                               lambda word: int(word))
+        for i in range(0, 61):
+            self._valueHandlers["payload%d" % (i,)] = (0x1400 + i * 48, "f",
+                                                       lambda value:
+                                                       value * const.LBSTOKG,
+                                                       lambda word:
+                                                       float(word)*const.KGSTOLB)
+                                                            
     def default(self, line):
         """Handle unhandle commands."""