Changeset 2009

Timestamp:

04/28/10 20:49:11 (2 years ago)

Author:

tolteque

Message:

o LoPlug?

• Adaptation to new airport management

NOTE: Dont know why, but airportManager always returns "noname" for the airport name !!!

Location:

trunk

Files:

• loplug.py (modified) (1 diff)
• loplug/plugins/lockon/llf.py (modified) (3 diffs)
• loplug/plugins/lockon/rtb.py (modified) (5 diffs)

trunk/loplug.py

@@ -25 +25 @@
 sys.path.append( os.path.join( sys.path[0], 'common', 'drawobjects'))
 sys.path.append( os.path.join( sys.path[0], 'common', 'lodb'))
+sys.path.append( os.path.join( sys.path[0], 'common', 'mesh'))
 sys.path.append( os.path.join( sys.path[0], 'lotatc_server'))
 sys.path.append( os.path.join( sys.path[0], 'lotatc_client'))

trunk/loplug/plugins/lockon/llf.py

@@ -23 +23 @@
 from pgservice                import PGService
 from lotatc_positionConverter import *
-from srtm30                   import Srtm30
+from meshselecter             import getMeshServer
 
 # ========================================================================================================
@@ -57 +57 @@
     self.plugItemRequests     = {}                             #- Dictionnary for all the requests
     self.posConverter         = PositionConverter()            #- Used to convert (latitude, longitude) to (x,y)
-    self.srtm                 = Srtm30()                       #- Used to get target altitude
     
     self.samplingPeriod       = Llf.LUA_SAMPLING_PERIOD        #- Default sampling period
@@ -153 +152 @@
     self.__computeVerticalVelocityInfo__()
 
+    # Get meshServer (Used to get target altitude) according to the FC version used
+    fcVersion = self.parentPlug.getFcVersion()
+    self.mesh = getMeshServer()
+    
+    
 #----------------------------------------------------------------
   # To save the settings

trunk/loplug/plugins/lockon/rtb.py

@@ -28 +28 @@
 from lodbselecter             import getDbParser
 from lotatc_positionConverter import *
+from airportdatamanager       import *
 
 
@@ -65 +66 @@
     self.dbParser                 = None                      #- FC db parser
     self.fcVersion                = None                      #- Flamming cliff version
+    self.airport_mng              = AirportDataManager("")
         
 # ========================================================================================================
@@ -138 +140 @@
       range = 100
       if self.dbParser:
+        for airportClsId, airportInfo in self.airport_mng.items():
+          airportName = airportInfo[CST_AIRPORT_NAME]
+          print airportClsId, airportName
+          self.airportsData[airportName] = {}
+          self.airportsData[airportName]["clsId"] = airportClsId
+          self.airportsData[airportName]["range"] = range
+          range -= 1
+        return
+      
         for clsId in cst_airportDict.keys():
           airportName = self.dbParser.getAirportById(clsId)
@@ -176 +187 @@
     self.widgets["ukraineAirports"].setLayout( ukraineAirports_vBox)
     
-    # Process RUSSIAN airports
+    # Process airports
     self.widgets["russiaAirports"] = QGroupBox( self.tr("Russia"))
     russiaAirports_vBox = QVBoxLayout()
     self.widgets["russiaAirports"].setLayout( russiaAirports_vBox)
 
-    for clsId in cst_airportDict.keys():
-      airportName = cst_airportDict[clsId][CST_AIRPORT_NAME]
-      self.widgets[clsId] = QCheckBox( QString( airportName))
-      if cst_airportDict[clsId][CST_AIRPORT_SIDE] == "Ukraine":
-        ukraineAirports_vBox.addWidget( self.widgets[clsId])
+    for airportClsId, airportInfo in self.airport_mng.items():
+      self.widgets[airportClsId] = QCheckBox( QString( airportInfo[CST_AIRPORT_NAME]))
+      if airportInfo[CST_AIRPORT_SIDE] == "Ukraine":
+        ukraineAirports_vBox.addWidget( self.widgets[airportClsId])
       else:
-        russiaAirports_vBox.addWidget( self.widgets[clsId])
-        
+        russiaAirports_vBox.addWidget( self.widgets[airportClsId])
+    
+    
     # Build complete UI
     hBox = QHBoxLayout()
@@ -209 +220 @@
   def _deinit_ui( self ):
     self.preselectedAirportClsIds = []
-    for clsId in cst_airportDict.keys():
-      if self.widgets[clsId].isChecked():
-        self.preselectedAirportClsIds.append( clsId)
+    for airportClsId, airportInfo in self.airport_mng.items():
+      if self.widgets[airportClsId].isChecked():
+        self.preselectedAirportClsIds.append( airportClsId)   
+        
+#    for clsId in cst_airportDict.keys():
+#      if self.widgets[clsId].isChecked():
+#        self.preselectedAirportClsIds.append( clsId)
 #----------------------------------------------------------------
   # Method invoked by the PGPluginClient parent on restart()