Changeset 2118

Timestamp:

07/19/10 17:47:11 (19 months ago)

Author:

tolteque

Message:

o LOTATC

• Add filtering in LUA, and add a parameter (isDetectable) in NEW_OBJECT frame

Location:

trunk/lotatc_server

Files:

• lotatc_FC2.lua (modified) (5 diffs)
• lotatc_luaServer.py (modified) (3 diffs)
• lotatc_object.py (modified) (3 diffs)

trunk/lotatc_server/lotatc_FC2.lua

@@ -95 +95 @@
   -- ==========================================================================
   getLotatcTypeFromLockonType = function( self, lockonType)
-    local lotatcObjectType = nil ;
-    
-    -- First level
-    if self.ObjectTypeLUT[lockonType.level1] then
-      if self.ObjectTypeLUT[ lockonType.level1 ][lockonType.level2] then
-        lotatcObjectType = self.ObjectTypeLUT[ lockonType.level1 ][lockonType.level2]
+    info = { 0, nil}
+
+    -- Process level by level
+    if self.objectTypeLUT[lockonType.level1] then
+      if self.objectTypeLUT[lockonType.level1][lockonType.level2] then
+        if self.objectTypeLUT[lockonType.level1][lockonType.level2][lockonType.level3] then
+          if self.objectTypeLUT[lockonType.level1 ][lockonType.level2][lockonType.level3][lockonType.level4] then
+            info = self.objectTypeLUT[lockonType.level1][lockonType.level2][lockonType.level3][lockonType.level4]
+          else
+            info = self.objectTypeLUT[lockonType.level1][lockonType.level2][lockonType.level3]
+          end
+        else
+          info = self.objectTypeLUT[lockonType.level1][lockonType.level2]
+        end
+      else
+        info = self.objectTypeLUT[lockonType.level1]
       end
     end
-    return lotatcObjectType
+    return info["flag"], info["tag"]
   end,
+
   
   -- ==========================================================================
@@ -111 +122 @@
         Start = function( self)
     -- Lookup table used to transcode lockonType to lotatcType
-    self.ObjectTypeLUT = { [wsType_Air]    = { [wsType_Airplane]   = self.AIRPLANE 
-                                             , [wsType_Helicopter] = self.HELICOPTER 
-                                             , [wsType_Free_Fall]  = self.CHAFF_FLARE 
+    self.objectTypeLUT = { [wsType_Air]    = { [wsType_Airplane]                              = { ["flag"] = 1, ["tag"] = self.AIRPLANE  }
+                                             , [wsType_Helicopter]                            = { ["flag"] = 1, ["tag"] = self.HELICOPTER}
                                              }
-                         , [wsType_Weapon] = { [wsType_Missile]    = self.MISSILE
-                                             , [wsType_Bomb]       = self.BOMB
-                                             , [wsType_Shell]      = self.SHELL
-                                             , [wsType_NURS]       = self.ROCKET
+                         , [wsType_Ground] = { [wsType_Moving]                                = { ["flag"] = 1, ["tag"] = self.GROUND_MOVING }
+                                             , [wsType_Tank]       = { [wsType_Gun]           = { ["flag"] = 0, ["tag"] = self.TANK}
+                                                                     , [wsType_MissGun]       = { ["flag"] = 0, ["tag"] = self.TANK}
+                                                                     , [wsType_Miss]          = { ["flag"] = 0, ["tag"] = self.TANK}
+                                                                     , [wsType_Radar]         = { ["flag"] = 1, ["tag"] = self.TANK}
+                                                                     , [wsType_NoWeapon]      = { ["flag"] = 0, ["tag"] = self.TANK}
+                                                                     }
+                                             , [wsType_SAM]        = { [wsType_Gun]           = { ["flag"] = 0, ["tag"] = self.SAM}
+                                                                     , [wsType_Miss]          = { ["flag"] = 0, ["tag"] = self.SAM}
+                                                                     , [wsType_MissGun]       = { ["flag"] = 0, ["tag"] = self.SAM}
+                                                                     , [wsType_Radar]         = { ["flag"] = 1, ["tag"] = self.SAM}
+                                                                     , [wsType_Radar_Gun]     = { ["flag"] = 1, ["tag"] = self.SAM}
+                                                                     , [wsType_Radar_Miss]    = { ["flag"] = 1, ["tag"] = self.SAM}
+                                                                     , [wsType_Radar_MissGun] = { ["flag"] = 1, ["tag"] = self.SAM}
+                                                                     , [wsType_NoWeapon]      = { ["flag"] = 0, ["tag"] = self.SAM}
+                                                                     }
                                              }
-                         , [wsType_Ground] = { [wsType_Moving]     = self.GROUND_MOVING
-                                             , [wsType_Standing]   = self.GROUND_STANDING
-                                             , [wsType_Tank]       = self.TANK
-                                             , [wsType_SAM]        = self.SAM
-                                             }
-                         , [wsType_Navy]   = { [wsType_Ship]       = self.SHIP
+                         , [wsType_Navy]   = { [wsType_Ship]                                  = { ["flag"] = 1, ["tag"] = self.SHIP}
                                              }
                          }
+    
   
     -- --------------------------------------------------------
@@ -191 +209 @@
     local worldObjects = LoGetWorldObjects() 
     for objectId, objectInfo in pairs( worldObjects) do
-  
       -- ---------------------------------------------------
       -- Use lookUpTable to convert Lockon Type
-      local objectType = self.getLotatcTypeFromLockonType( self, objectInfo.Type)
+      local isDetectable
+      local objectType
+      isDetectable, objectType = self.getLotatcTypeFromLockonType( self, objectInfo.Type)
       if objectType then
         -- ---------------------------------------------------
@@ -261 +280 @@
             groupName = ""
           end
+          if not unitName then
+            unitName = ""
+          end
           if not pilotName then
             pilotName = ""
@@ -267 +289 @@
           -- ---------------------------------------------------
           -- Fill the buffer with NEW_OBJECT message
-          message = message..string.format( "%s|%s|%s|%s|%s|%s|%s", self.NEW_OBJECT, objectId, objectType, unitName, pilotName, coalition, groupName)
+          message = message..string.format( "%s|%s|%s|%s|%s|%s|%s|%s"
+                                          , self.NEW_OBJECT
+                                          , objectId
+                                          , objectType
+                                          , unitName
+                                          , pilotName
+                                          , coalition
+                                          , groupName
+                                          , isDetectable
+                                          )
         end -- end of: if createObject==true then
   

trunk/lotatc_server/lotatc_luaServer.py

@@ -429 +429 @@
       # items[5] -> coalition
       # items[6] -> groupName
+      # items[7] -> isDetectable
       objectId = int(items[1])
       unitName = unicode(items[3], self.luaServer.lo_encoding)
@@ -453 +454 @@
           # Process found unit
           self.localObjectsDb[objectId].setGroupName( items[6])
+          self.localObjectsDb[objectId].setDetectionFlag( items[7])
           self.foundUnit[items[4]] = items[6]
-          readIndex = 7
+          readIndex = 8
                           
                           
@@ -550 +552 @@
     # Loop over the localObjectsDb to detect objects which are visible.
     for (key, thisObject) in self.localObjectsDb.iteritems():
+      # -------------------------------------------------------------------------------------
+      # Check if the object if detectable by Lotatc
+      if not thisObject.isDetectable():
+        continue
+        
       # -------------------------------------------------------------------------------------
       # Check if object is catchable

trunk/lotatc_server/lotatc_object.py

@@ -39 +39 @@
     self.unitClsId = unitClsId
     self.groupName = ""
+    self.detection = False
 
     # init default value for latitude and longitude
@@ -61 +62 @@
   def setGroupName(self, groupName):
     self.groupName = groupName
-    
+
+# ============================================================
+  ## Set the flag which indicate if the unit is detectable by Latatc
+  # @param self             instance id
+  # @param flag             detection flag: "0"/"1"
+  def setDetectionFlag( self, flag):
+    if flag == "1":
+      self.detection = True
+
+# ============================================================
+  ## Tells if the unit is detectable by Lotatv
+  # @param self             instance id
+  def isDetectable( self):
+    return self.detection
+      
 # ============================================================
   ## Returns a duplicated object
@@ -71 +86 @@
     newObject.catchingRadar = self.catchingRadar
     newObject.groupName     = self.groupName
+    newObject.detection     = self.detection
     return newObject