Changes in / [917:803dc6bacfa5:908:fcf3c44650f1]

Files:

• MANIFEST.in (modified) (1 diff)
• docker/build-mlxwinebuild.sh (deleted)
• docker/context/Dockerfile (deleted)
• docker/context/build.sh (deleted)
• docker/context/entrypoint.sh (deleted)
• docker/context/setup.sh (deleted)
• docker/initialize-mlxwinebuild.sh (deleted)
• setup.py (modified) (1 diff)
• src/mlx/acft.py (modified) (1 diff)
• src/mlx/checks.py (modified) (1 diff)
• src/mlx/const.py (modified) (1 diff)
• src/mlx/fs.py (modified) (1 diff)
• src/mlx/gui/cef.py (modified) (2 diffs)
• src/mlx/xplane.py (modified) (5 diffs)
• winemakeinst.bat (deleted)

MANIFEST.in

@@ -1 +1 @@
 include mlx.nsi
 include makeinst.bat
-include winemakeinst.bat
 include license.txt
 include runmlx.py

setup.py

@@ -63 +63 @@
                            glob(os.path.join(cefDir, "locales", "*"))))
 
-    if os.getenv("WINE")=="yes":
-        winsysdir=os.getenv("WINSYSDIR")
-        data_files.append(("", [os.path.join(winsysdir, "python27.dll")]))
-        data_files.append(("library", [
-                            os.path.join(winsysdir, "pywintypes27.dll"),
-                            os.path.join(winsysdir, "WINHTTP.dll")]))
-
-        if gtkRuntimeDir:
-            gtkBinDir = os.path.join(gtkRuntimeDir, "bin")
-            data_files.append(("library", [
-                                os.path.join(gtkBinDir, "freetype6.dll"),
-                                os.path.join(gtkBinDir, "intl.dll"),
-                                os.path.join(gtkBinDir, "zlib1.dll"),
-                                os.path.join(gtkBinDir, "libglib-2.0-0.dll"),
-                                os.path.join(gtkBinDir, "libatk-1.0-0.dll"),
-                                os.path.join(gtkBinDir, "libcairo-2.dll"),
-                                os.path.join(gtkBinDir, "libexpat-1.dll"),
-                                os.path.join(gtkBinDir, "libpangowin32-1.0-0.dll"),
-                                os.path.join(gtkBinDir, "libgio-2.0-0.dll"),
-                                os.path.join(gtkBinDir, "libgdk-win32-2.0-0.dll"),
-                                os.path.join(gtkBinDir, "libpng14-14.dll"),
-                                os.path.join(gtkBinDir, "libgobject-2.0-0.dll"),
-                                os.path.join(gtkBinDir, "libgdk_pixbuf-2.0-0.dll"),
-                                os.path.join(gtkBinDir, "libfontconfig-1.dll"),
-                                os.path.join(gtkBinDir, "libpangoft2-1.0-0.dll"),
-                                os.path.join(gtkBinDir, "libgmodule-2.0-0.dll"),
-                                os.path.join(gtkBinDir, "libpango-1.0-0.dll"),
-                                os.path.join(gtkBinDir, "libpangocairo-1.0-0.dll"),
-                                os.path.join(gtkBinDir, "libgtk-win32-2.0-0.dll"),
-                                os.path.join(gtkBinDir, "libgthread-2.0-0.dll")
-                              ]))
-        if cefDir:
-            data_files.append(("library", [
-                                os.path.join(cefDir, "libcef.dll")
-                              ]))
-
     print data_files
 

src/mlx/acft.py

@@ -1149 +1149 @@
             self.mtow = 100000
             self.mlw = 80000
-        elif bookedFlight.tailNumber=="HA-LCX":
-            self.mtow = 100000
-            self.mlw = 80000
-            self.mzfw = 74000
-
-            self.flapSpeedLimits = { 15 : 227,
-                                     28 : 194,
-                                     36 : 178,
-                                     45 : 162 }
 
     def _appendLightsLoggers(self):

src/mlx/checks.py

@@ -1021 +1021 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        isXPlane = (flight.aircraftType==const.AIRCRAFT_DH8D or
-                    flight.aircraftType==const.AIRCRAFT_B733) and \
-                    (flight.fsType==const.SIM_XPLANE11 or
-                     flight.fsType==const.SIM_XPLANE10 or
-                     flight.fsType==const.SIM_XPLANE9)
         if flight.stage==const.STAGE_CRUISE:
-            bankLimit = 40 if isXPlane else 30
+            isDH8DXplane = flight.aircraftType==const.AIRCRAFT_DH8D and \
+                           (flight.fsType==const.SIM_XPLANE10 or
+                            flight.fsType==const.SIM_XPLANE9)
+            bankLimit = 35 if isDH8DXplane else 30
         elif flight.stage in [const.STAGE_TAKEOFF, const.STAGE_CLIMB,
                               const.STAGE_DESCENT, const.STAGE_LANDING]:
-            bankLimit = 45 if isXPlane else 35
+            bankLimit = 35
         else:
             return False

src/mlx/const.py

@@ -49 +49 @@
 ## Flight simulator type: Prepar3D
 SIM_P3D = 5
-
-## Flight simulator type: X-Plane 11
-SIM_XPLANE11 = 6
 
 #-------------------------------------------------------------------------------

src/mlx/fs.py

@@ -62 +62 @@
     if type in [const.SIM_MSFS9, const.SIM_MSFSX]:
         return fsuipc.Simulator(connectionListener, connectAttempts = 3)
-    elif type in [const.SIM_XPLANE9, const.SIM_XPLANE10, const.SIM_XPLANE11]:
+    elif type in [const.SIM_XPLANE9, const.SIM_XPLANE10]:
         return xplane.Simulator(connectionListener, connectAttempts = 3)
     else:
-        "Only MS Flight Simulator 2004 and X or X-Plane 9, 10 and 11 are supported"
+        "Only MS Flight Simulator 2004 and X or X-Plane 9 and 10 are supported"
 
 #-------------------------------------------------------------------------------

src/mlx/gui/cef.py

@@ -309 +309 @@
         container.connect("size-allocate", _handleSizeAllocate)
     else:
-        container = gtk.DrawingArea()
+        container = gtk.VBox(True, 0)
 
     container.show()
@@ -327 +327 @@
             windowID = window.handle
     else:
-        windowID = container.window.xid
+        m = re.search("GtkVBox at 0x(\w+)", str(container))
+        hexID = m.group(1)
+        windowID = int(hexID, 16)
 
     windowInfo = cefpython.WindowInfo()

src/mlx/xplane.py

@@ -506 +506 @@
                   (xplaneVersion, xplmVersion, xplraVersion)
                 if not autoReconnection:
-                    fsType = const.SIM_XPLANE11 if xplaneVersion>=11000 else \
-                      (const.SIM_XPLANE10 if xplaneVersion>=10000 else const.SIM_XPLANE9)
+                    fsType = const.SIM_XPLANE10 if xplaneVersion>=10000 else const.SIM_XPLANE9
 
                     Handler._callSafe(lambda:
@@ -1435 +1434 @@
 
         flapsControl = data[self._monidx_flapsControl]
-        flapsIndex = int(round(flapsControl * (len(self._flapsNotches)-1)))
+        flapsIndex = int(flapsControl * (len(self._flapsNotches)-1))
         state.flapsSet = 0 if flapsIndex<1 else self._flapsNotches[flapsIndex]
 
@@ -1879 +1878 @@
 
 class T154Model(GenericAircraftModel):
-    """Generic model for the Tupolev Tu-154 aircraft."""
+    """Generic model for the Tupolev Tu-134 aircraft."""
     fuelTanks = [const.FUELTANK_CENTRE, const.FUELTANK_CENTRE2,
                  const.FUELTANK_RIGHT, const.FUELTANK_LEFT,
@@ -1903 +1902 @@
         del state.reverser[1]
         return state
-
-#------------------------------------------------------------------------------
-
-class FelisT154Model(T154Model):
-    """Model for Felis' Tupolev Tu-154-M aircraft."""
-    @staticmethod
-    def doesHandle(aircraft, (tailnum, author, description, notes,
-                              icao, liveryPath)):
-        """Determine if this model handler handles the aircraft with the given
-        name."""
-        return aircraft.type==const.AIRCRAFT_T154 and \
-          author.find("Felis")!=-1 and \
-          description.find("Tu154M")!=-1
-
-    def __init__(self):
-        """Construct the model."""
-        super(T154Model, self). \
-            __init__(flapsNotches = [0, 15, 28, 36, 45],
-                     fuelTanks = T154Model.fuelTanks,
-                     numEngines = 3)
-
-    @property
-    def name(self):
-        """Get the name for this aircraft model."""
-        return "X-Plane/Felis Tupolev Tu-154-M"
 
 #------------------------------------------------------------------------------
@@ -1970 +1944 @@
 
 AircraftModel.registerSpecial(FJSDH8DModel)
-AircraftModel.registerSpecial(FelisT154Model)
 
 #------------------------------------------------------------------------------