Changeset 148:453ebaea9090

Timestamp:

05/03/12 18:27:13 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Implemented FS time synchronization

Location:

src/mlx

Files:

• config.py (modified) (4 diffs)
• fsuipc.py (modified) (6 diffs)
• gui/gui.py (modified) (2 diffs)
• gui/prefs.py (modified) (3 diffs)
• i18n.py (modified) (2 diffs)

src/mlx/config.py

@@ -41 +41 @@
         self._onlineACARS = True
         self._flareTimeFromFS = False
+        self._syncFSTime = False
         
         self._autoUpdate = True        
@@ -145 +146 @@
         if flareTimeFromFS!=self._flareTimeFromFS:
             self._flareTimeFromFS = flareTimeFromFS
+            self._modified = True
+
+    @property
+    def syncFSTime(self):
+        """Get whether the simulator's time should be synchronized with the
+        machine's clock."""
+        return self._syncFSTime
+
+    @syncFSTime.setter
+    def syncFSTime(self, syncFSTime):
+        """Set whether the simulator's time should be synchronized with the
+        machine's clock."""
+        if syncFSTime!=self._syncFSTime:
+            self._syncFSTime = syncFSTime
             self._modified = True
 
@@ -213 +228 @@
                                                  "flareTimeFromFS",
                                                  False)
+        self._syncFSTime = self._getBoolean(config, "general",
+                                            "syncFSTime",
+                                            False)
 
         self._messageTypeLevels = {}
@@ -249 +267 @@
         config.set("general", "flareTimeFromFS",
                    "yes" if self._flareTimeFromFS else "no")
+        config.set("general", "syncFSTime",
+                   "yes" if self._syncFSTime else "no")
 
         config.add_section(Config._messageTypesSection)

src/mlx/fsuipc.py

@@ -471 +471 @@
                    (0x0580, "d") ]           # Heading
 
+    TIME_SYNC_INTERVAL = 3.0
+
     @staticmethod
     def _getTimestamp(data):
@@ -514 +516 @@
         self._scroll = False
 
+        self._syncTime = False
+        self._nextSyncTime = -1
+        
         self._normalRequestID = None
 
@@ -536 +541 @@
         self._handler.connect()
         if self._normalRequestID is None:
+            self._nextSyncTime = -1
             self._startDefaultNormal()
 
@@ -638 +644 @@
             data.append( (offset, "u", long(level * 128.8 * 65536.0)) )
         self._handler.requestWrite(data, self._handleFuelWritten)
+
+    def enableTimeSync(self):
+        """Enable the time synchronization."""
+        self._nextSyncTime = -1
+        self._syncTime = True
+            
+    def disableTimeSync(self):
+        """Enable the time synchronization."""
+        self._syncTime = False
+        self._nextSyncTime = -1
             
     def disconnect(self):
@@ -678 +694 @@
 
         self._scroll = data[7]!=0
+
+        self._checkTimeSync()
         
         if self._monitoringRequested and not self._monitoring:
@@ -691 +709 @@
             self._aircraft.handleState(aircraftState)
 
+    def _checkTimeSync(self):
+        """Check if we need to synchronize the FS time."""
+        if not self._syncTime: return
+
+        now = time.time()
+        seconds = time.gmtime(now).tm_sec
+
+        if seconds>30 and seconds<59:
+            if self._nextSyncTime > (now - 0.49):
+                return
+            
+            self._handler.requestWrite([(0x023a, "b", int(seconds))],
+                                       self._handleTimeSynced)
+            
+            #print "Set the seconds to ", seconds
+
+            if self._nextSyncTime<0:
+                self._nextSyncTime = now
+                
+            self._nextSyncTime += Simulator.TIME_SYNC_INTERVAL
+        else:
+            self._nextSyncTime = -1
+
+    def _handleTimeSynced(self, success, extra):
+        """Callback for the time sync result."""
+        pass
+        
     def _setAircraftName(self, timestamp, name, airPath):
         """Set the name of the aicraft and if it is different from the

src/mlx/gui/gui.py

@@ -699 +699 @@
             self._simulator = fs.createSimulator(const.SIM_MSFS9, self)
             fs.setupMessageSending(self.config, self._simulator)
-
+            self._setupTimeSync()
+        
         self._flight.simulator = self._simulator
 
@@ -853 +854 @@
         """Callback for editing the preferences."""
         self._preferences.run(self.config)
+        self._setupTimeSync()
+
+    def _setupTimeSync(self):
+        """Enable or disable the simulator time synchronization based on the
+        configuration."""
+        simulator = self._simulator
+        if simulator is not None:
+            if self.config.syncFSTime:
+                simulator.enableTimeSync()
+            else:
+                simulator.disableTimeSync()

src/mlx/gui/prefs.py

@@ -71 +71 @@
         self._onlineACARS.set_active(config.onlineACARS)
         self._flareTimeFromFS.set_active(config.flareTimeFromFS)
+        self._syncFSTime.set_active(config.syncFSTime)
 
         for messageType in const.messageTypes:
@@ -96 +97 @@
         config.onlineACARS = self._onlineACARS.get_active()
         config.flareTimeFromFS = self._flareTimeFromFS.get_active()
+        config.syncFSTime = self._syncFSTime.get_active()
 
         for messageType in const.messageTypes:
@@ -167 +169 @@
         self._flareTimeFromFS.set_tooltip_text(xstr("prefs_flaretimeFromFS_tooltip"))
         mainBox.pack_start(self._flareTimeFromFS, False, False, 4)
+                                       
+        self._syncFSTime = gtk.CheckButton(xstr("prefs_syncFSTime"))
+        self._syncFSTime.set_use_underline(True)
+        self._syncFSTime.set_tooltip_text(xstr("prefs_syncFSTime_tooltip"))
+        mainBox.pack_start(self._syncFSTime, False, False, 4)
                                        
         return mainAlignment

src/mlx/i18n.py

@@ -616 +616 @@
                  "If this is checked, the time of the flare will be calculated "
                  "from timestamps returned by the simulator.")
+        self.add("prefs_syncFSTime",
+                 "_Synchronize the time in FS with the computer's clock")
+        self.add("prefs_syncFSTime_tooltip",
+                 "If this is checked the flight simulator's internal clock "
+                 "will always be synchronized to the computer's clock.")
         self.add("prefs_update_auto", "Update the program auto_matically")
         self.add("prefs_update_auto_tooltip",
@@ -1164 +1169 @@
                  "Ha ezt bejelölöd, a kilebegtetés idejét a szimulátor "
                  "által visszaadott időbélyegek alapján számolja a program.")
+        self.add("prefs_syncFSTime",
+                 "_Szinkronizáld a szimulátor idéjét a számítógépével")
+        self.add("prefs_syncFSTime_tooltip",
+                 "Ha ez bejelölöd, a szimulátor belső óráját a program "
+                 "szinkronban tartja a számítógép órájával.")
         self.add("prefs_update_auto",
                  "Frissítsd a programot _automatikusan")