Changeset 2177

Timestamp:

09/29/10 17:24:30 (20 months ago)

Author:

tolteque

Message:

o LoDyn?

o Create loDynServer
o Start loDynServer
o Invoke most of the interfaces of loDynServer from luaServer (still positions to process)

Location:

trunk

Files:

• lotatc_server/lotatc_FC2.lua (modified) (1 diff)
• lotatc_server/lotatc_luaServer.py (modified) (8 diffs)
• lotatc_server_ui.py (modified) (5 diffs)

trunk/lotatc_server/lotatc_FC2.lua

@@ -164 +164 @@
       end
     end
+    
+    -- Not yet tested 
+    return
+    
+    -- Remove detectedWeapon which are no more present
+    for weaponId, weaponInfo in pairs( self.detectedWeapon) do
+      if ( not worldObjects[weaponId]) and ( not ballisticObjects[weaponId]) then
+        self.detectedWeapon[weaponId] = nil
+      end
+    end
+    
+    
   end,
   

trunk/lotatc_server/lotatc_luaServer.py

@@ -28 +28 @@
 from lotatc_object      import *
 from lotatc_radarList   import *
+from lotatc_lodynServer import *
 
 # Common declaration with export.lua and LuaServer
@@ -62 +63 @@
     # Save dbParser parser instance
     self.dbParser = server.dbParser
+    # Retrieve loDynServer instance
+    self.loDynServer = server.loDynServer
 
     # Init LostAndFound
@@ -410 +413 @@
     # -------------------------------------------------------------------------------------
     elif command == END_OF_TIME_SLOT:
-      # Process loast and found units
+      # Foward lost and found units to loDynServer
       if self.foundUnit or self.lostUnit:
-        print "Process lost and found units"
+        # Process found units
         for unit, group in self.foundUnit.iteritems():
-          print "Found unit %s for group %s" % ( unit, group)
+          self.loDynServer.newUnit( group, unit)
+          
+        # Process killed units
         for unit, group in self.lostUnit.iteritems():
-          print "Lost unit %s for group %s" % ( unit, group)
-          
-      self.lostUnit  = {}
+          self.loDynServer.unitKilled( group, unit)
+        self.lostUnit  = {}
+        
+        # As there was some info, foward that to loDynServer
+        self.loDynServer.endOfSlot()
+        
       return True
 
@@ -431 +439 @@
       weaponName  = unicode( items[2], self.luaServer.lo_encoding)
       weaponCount = int( items[3])
-      print "%s has launched %d %s" % ( self.localObjectsDb[objectId].pilotName, weaponCount, weaponName)
-      
+      
+      # Forward this info to loDynServer
+      self.loDynServer.weaponUsed( self.localObjectsDb[objectId].groupName
+                                 , self.localObjectsDb[objectId].pilotName
+                                 , weaponName
+                                 , weaponCount
+                                 )
       
     # -------------------------------------------------------------------------------------
@@ -493 +506 @@
       self.logger.info("Start time: %s" % items[1])
       self.logger.info("Sampling period: %s" % items[2])
+      
+      # Forward info to loDynServer
+      self.loDynServer.startOfMission()
+      
 
     # -------------------------------------------------------------------------------------
@@ -508 +525 @@
          self.coalitionLocks[coalition].release()
       self.mainInfo["EndOfMission"] = True
+      
+      # Forward info to loDynServer
+      self.loDynServer.endOfMission()
       
     else:
@@ -675 +695 @@
   # @param coalitionObjects,        To share detected objects with radars
   # @param coalitionLocks             Lock on coalitionObjects
-  def __init__(self, serverAddress, mainInfo, globalServerConfig, dbParser,
-               meshServer, coalitionObjects, coalitionLocks):
+  def __init__( self, serverAddress, loDynServer, mainInfo, globalServerConfig, dbParser
+              , meshServer, coalitionObjects, coalitionLocks):
     self.logger = logging.getLogger('[LuaServer]')
     self.logger.debug("__init__")
@@ -684 +704 @@
        
     # Save parameters
+    self.loDynServer = loDynServer
     self.mainInfo = mainInfo
     self.mainInfo["TimeStamp"] = {}

trunk/lotatc_server_ui.py

@@ -51 +51 @@
 from lotatc_radarServer  import RadarServer
 from datalink_server     import DataLinkServer
+from lotatc_lodynServer  import LoDynServer
 from missionPlaybackDlg  import *  
 from lua_export_check    import check_exports
@@ -146 +147 @@
 #----------------------------------- SERVER FUNCTIONS
 def launch_servers():
+
+    # Create the loDynServer
+    g_window.loDynServer = LoDynServer( ('',  CST_LODYN_PORT))
+    g_window.loDynServer.lo_encoding = g_window.encoding
+    g_window.loDynServerThread = threading.Thread(target = g_window.loDynServer.serve_forever)
+    g_window.loDynServerThread.setDaemon(True) 
+    g_window.loDynServerThread.start()
+    
     # Create the luaServer which receive data from lua (lua is the client ...)
     g_window.luaServer = LuaServer( ('',  CST_LUA_PORT)
+                                  , g_window.loDynServer
                                   , g_window.mainInfo
                                   , g_window.configuration
@@ -156 +166 @@
                                   )
     g_window.luaServer.lo_encoding = g_window.encoding
-    # Create, configure and start a thread for this server
     g_window.luaServerThread = threading.Thread(target = g_window.luaServer.serve_forever)
     g_window.luaServerThread.setDaemon(True) 
     g_window.luaServerThread.start()
     
-    # Now create the RadarServer. There will a thread per connection
+    # Create the RadarServer. There will a thread per connection
     g_window.radarServer = RadarServer( ('',  CST_RADAR_PORT)
                                       ,  g_window.mainInfo
@@ -173 +182 @@
     g_window.radarServerThread.setDaemon(True) 
     g_window.radarServerThread.start()
-    # Now create the DataLink. There will a thread per connection
-    g_window.datalinkServer = DataLinkServer( ('',  CST_DATALINK_PORT),
-                                        g_window.radarServer,
-                                        g_pathname)
+    
+    # Create the DataLink. There will a thread per connection
+    g_window.datalinkServer = DataLinkServer( ('',  CST_DATALINK_PORT)
+                                            , g_window.radarServer
+                                            , g_pathname
+                                            )
     g_window.datalinkServerThread = threading.Thread(target = g_window.datalinkServer.serve_forever)
     g_window.datalinkServerThread.setDaemon(True) 
     g_window.datalinkServerThread.start()
     g_window.server_run = True
+    
+
 #-----------------------------------
 def load_dbParser( version, stop=False):
@@ -420 +433 @@
     g_window.radarServer = None
     g_window.datalinkServer = None
+    g_window.lorealityServer = None
     g_window.log_to_play = None
     g_window.play_back_window = None