Changeset 2271

Timestamp:

11/09/10 19:45:14 (19 months ago)

Author:

tolteque

Message:

o LoPlug?

• LLF -> process received command in _data_received() not in selection() which is reserved for selection in list.
• RTB -> remove comments

Location:

trunk/loplug/plugins

Files:

• lockon/llf_fc2.py (modified) (12 diffs)
• lockon/rtb.py (modified) (1 diff)
• teamspeak/pgteamspeak.py (modified) (1 diff)

trunk/loplug/plugins/lockon/llf_fc2.py

@@ -29 +29 @@
 class Llf( PGService):
   
-  TOOGLE_LLF_FEATURE = CST_LOPLUG_COMMAND + "TOOGLE_LLF_FEATURE"
+  TOGGLE_LLF_FEATURE = CST_LOPLUG_COMMAND + "LlfToggleFeature"
   
   REQUESTED_DATAS = [ "Lockon.LuaServer." + CST_LOPLUG_REQUEST + "Latitude"
@@ -91 +91 @@
   # @param serviceInstanceByItemId   service dictionnary to be filled
   def fillProviderInfo( self, providerCapabilities):
-    providerCapabilities.append( ProviderInfo( name           = self.tr("TOOGLE_LLF_FEATURE")
-                                             , id             = self.build_full_itemId( Llf.TOOGLE_LLF_FEATURE)
-                                             , description    = self.tr("Toogle the feature: Low Level Flight")
+    providerCapabilities.append( ProviderInfo( name           = Llf.TOGGLE_LLF_FEATURE
+                                             , id             = self.build_full_itemId( Llf.TOGGLE_LLF_FEATURE)
+                                             , description    = self.tr("Toggle the feature: Low Level Flight")
                                              , category       = CST_LOPLUG_CAPA_CMD
                                              , type           = CST_LOPLUG_TYPE_STRING
@@ -114 +114 @@
     if value:
       self.targetedAltitudeASFC = int( value)
-    self.__computeVerticalVelocityInfo__()
 
     # Get meshServer (Used to get target altitude) according to the FC version used
     fcVersion = self.parentPlug.getFcVersion()
-    self.mesh = getMeshServer()
+    self.mesh = getMeshServer( fcVersion)
     
     
@@ -181 +180 @@
     self.samplingPeriod       = self.widgets["spx_LlfSamplingPeriod"].value()
     self.targetedAltitudeASFC = self.widgets["spx_LlftargetedAltitude"].value()
-    self.__computeVerticalVelocityInfo__()
 #----------------------------------------------------------------
   # Method invoked by the PGPluginClient parent on restart()
@@ -202 +200 @@
   # @param supInfo                   suplementary info
   def _data_requested( self, srcPlugId, itemId, period, supInfo):
+    print "[LLF] _data_requested() ->", srcPlugId, itemId, period, supInfo
     # Create entry for this itemId if it does not exist
     if not self.plugItemRequests.has_key( itemId):
@@ -224 +223 @@
           del self.plugItemRequests[itemId]
 #----------------------------------------------------------------
-  # A toogle occurs on the LLF feature
+  # A toggle occurs on the LLF feature
   # @param self                      instance class
   # @param srcPlugId                 Id of the plug sending the data
   # @param datas                     datas
   def selection( self, srcPlugId, datas):
+    print "As there is no list -> there is no selection !!! PROBLEM IN RECEIVING THAT ..."
+    pass
     if self.featureEnable:
       self.debug( "[LLF] feature disable" )
@@ -256 +257 @@
   # @param szobj                     object
   def _data_received( self, destSvc, srcPlugId, szobj):
-#    print "[LLF] data received, itemId: %s, value: %s" % ( szobj.data_id, szobj.text)
+    print "[LLF] data received, itemId: %s, value: %s" % ( szobj.data_id, szobj.text)
     
     if szobj.data_id == "Lockon.LuaServer.AltitudeAmsl":
@@ -283 +284 @@
       self.__monitAltitude__( timeNow)
       self.timeNow = timeNow
+      
+    elif szobj.data_id == self.build_full_itemId( Llf.TOGGLE_LLF_FEATURE):
+      if self.featureEnable:
+        print "[LLF] feature disable"
+        self.featureEnable = False
+      else:
+        print "[LLF] feature enable"
+        self.featureEnable = True
+      self.__sendData__( None, Llf.TOGGLE_LLF_FEATURE)  
+      
     else:
       raise ValueError("Unknown itemId %s" % szobj.data_id)
@@ -316 +327 @@
   def __sendData__( self, srcPlugId, itemId):
     objToSend = None
-    if itemId == Llf.TOOGLE_LLF_FEATURE:
+    if itemId == Llf.TOGGLE_LLF_FEATURE:
       if self.featureEnable:
         objToSend = SzText( from_id = self.parentPlug.get_name()
-                          , data_id = self.build_full_itemId( Llf.TOOGLE_LLF_FEATURE)
-                          , text    = str( "Switch LLF On")
+                          , data_id = self.build_full_itemId( Llf.TOGGLE_LLF_FEATURE)
+                          , text    = str( "LLF is On")
                           )
       else:
         objToSend = SzText( from_id = self.parentPlug.get_name()
-                          , data_id = self.build_full_itemId( Llf.TOOGLE_LLF_FEATURE)
-                          , text    = str( "Switch LLF Off")
+                          , data_id = self.build_full_itemId( Llf.TOGGLE_LLF_FEATURE)
+                          , text    = str( "LLF is Off")
                           )
     
     if objToSend:
-      if not srcPlugId:
-        srcPlugId = self.plugItemRequests[itemId]
-      self.parentPlug.send_object( srcPlugId, PGPluginClient.OPCODE_DATA_VALUE, objToSend )  
-
-
+      if srcPlugId:
+        self.parentPlug.send_object( [srcPlugId], PGPluginClient.OPCODE_DATA_VALUE, objToSend )
+      else:
+        self.parentPlug.send_object( self.plugItemRequests[itemId], PGPluginClient.OPCODE_DATA_VALUE, objToSend )  
+      
 #----------------------------------------------------------------
   # Performe the altitude control for the feature
@@ -414 +425 @@
     for index in range( 0, nbrOfCheckPoint):
       radius = index * unitaryRadius
-      self.checkPointList.append( CheckPoint( index, radius, self.luaPointList[index])
+      self.checkPointList.append( CheckPoint( index, radius, self.luaPointList[index]))
  
     # Set target elevation for each point according the ground slop at this point
@@ -551 +562 @@
     else:
       sign = -1
-    
-    return radius = math.sqrt( (radius_C**2) + (elevation_C**2)), sign
+    radius = math.sqrt( (radius_C**2) + (elevation_C**2))
+    return radius, sign
       
 # ========================================================================================================
@@ -653 +664 @@
   # Set the a coef for speed vector
   # @param self                   Instance class
-  def setSpeedVectorCoef( self, aCoefSpeed)
+  def setSpeedVectorCoef( self, aCoefSpeed):
     self.aCoefSpeed = aCoefSpeed
 #----------------------------------------------------------------
   # Returns the speed vector coef at this point
   # @param self                   Instance class
-  def getSpeedVectorCoef( self)
+  def getSpeedVectorCoef( self):
     return self.aCoefSpeed
       

trunk/loplug/plugins/lockon/rtb.py

@@ -179 +179 @@
       airportClsId = airportInfo["clsId"].lower()
       self.widgets[airportClsId] = QCheckBox( QString( airportName))
-      print airportInfo["side"]
+#      print airportInfo["side"]
       if airportInfo["side"] == "Blue":
         blueAirports_vBox.addWidget( self.widgets[airportClsId])

trunk/loplug/plugins/teamspeak/pgteamspeak.py

@@ -284 +284 @@
   # So, here execute restart specific part.
   # @param self                      instance class
-  # @param srcPlugId                 Id of the requester plug (renderer)
-  # @param dataId                    identifier of the requested data
-  # @param period                    not used
-  # @param supInfo                   not used
+  # @param szDataRequest             serialized request
   def _data_requested( self, szDataRequest):
     # Create entry for this data if not yet done