Changeset 1944 for trunk/loplug/plugins/lockon/llf.py

Timestamp:

04/03/10 18:42:09 (2 years ago)

Author:

dart

Message:

I18n:
o Last translations update

LoPlug?:
o Fix last deliveries for logger (need more work later)

File:

• trunk/loplug/plugins/lockon/llf.py (modified) (9 diffs)

trunk/loplug/plugins/lockon/llf.py

@@ -262 +262 @@
   def selection( self, srcPlugId, datas):
     if self.featureEnable:
-      self.logger.debug( "[LLF] feature disable" )
+      self.debug( "[LLF] feature disable" )
       self.featureEnable = False
       
@@ -273 +273 @@
             
     else:
-      self.logger.debug( "[LLF] feature enable" )
+      self.debug( "[LLF] feature enable" )
       self.featureEnable = True
       
@@ -326 +326 @@
   # @param cmdData                   associated data
   def _execute_command( self, cmdId, cmdData):
-    self.logger.debug( "[LLF] Execute command %s with data %s" % ( cmdId, cmdData) )
+    self.debug( "[LLF] Execute command %s with data %s" % ( cmdId, cmdData) )
 #----------------------------------------------------------------
   # To shutdown the instance
@@ -402 +402 @@
     # Get the next most constraining ground elevation and its arrival time
     nextMapElevation, nextMapTime = self.__getNextMostConstraningGroundElevation__()
-    self.logger.debug( nextMapElevation, nextMapTime )
+    self.debug( nextMapElevation, nextMapTime )
     if nextMapTime == 0:
       # The current position is the most constraining one, there is is no montain to climb.
@@ -411 +411 @@
       deltaHeightInPerCent = self.deltaHeight / self.targetedAltitudeASFC
       
-      self.logger.debug( "planeHeight: %s, deltaHeight: %s, deltaHeightInPerCent: %s" % ( self.altitudeASFC, self.deltaHeight, deltaHeightInPerCent) )
+      self.debug( "planeHeight: %s, deltaHeight: %s, deltaHeightInPerCent: %s" % ( self.altitudeASFC, self.deltaHeight, deltaHeightInPerCent) )
 
       found = False
@@ -432 +432 @@
       # Compute corresponding targetedAlitude
       targetedAltitude = self.altitudeASFC - self.altitudeAMSL + nextMapElevation + self.targetedAltitudeASFC
-      self.logger.debug( "ASFC: ", self.altitudeASFC )
-      self.logger.debug( "AMSL: ", self.altitudeAMSL )
-      self.logger.debug( "tgt : ", targetedAltitude )
+      self.debug( "ASFC: ", self.altitudeASFC )
+      self.debug( "AMSL: ", self.altitudeAMSL )
+      self.debug( "tgt : ", targetedAltitude )
       
       # Compute the delta (in per cent) between the target and plane altitudes.
       self.deltaHeight = ( targetedAltitude - self.altitudeASFC)
-      self.logger.debug( "delta: ", self.deltaHeight )
+      self.debug( "delta: ", self.deltaHeight )
       deltaHeightInPerCent = self.deltaHeight / self.targetedAltitudeASFC
 
@@ -450 +450 @@
 
 
-    self.logger.debug( "verticalVelocity: %s, requestedVerticalVelocity: %s" % ( self.verticalSpeed, requestedVerticalVelocity) )
+    self.debug( "verticalVelocity: %s, requestedVerticalVelocity: %s" % ( self.verticalSpeed, requestedVerticalVelocity) )
 
     # Compute error, integratedError and derivedError
@@ -457 +457 @@
     derivedError           = error - self.AltiPrevError
 
-    self.logger.debug( "error: %s, integratedError: %s" % ( error, self.AltIntragedError) )
+    self.debug( "error: %s, integratedError: %s" % ( error, self.AltIntragedError) )
     
     # Compute PID components, and apply threshold on command
@@ -543 +543 @@
       mapElevation, latitude, logitude = self.srtm.getElevationByMin( latitude*60, longitude*60)
       self.nextMapElevations.append( mapElevation)
-      self.logger.debug( "idx: %3d  -> %s" % ( index+1, mapElevation) )
+      self.debug( "idx: %3d  -> %s" % ( index+1, mapElevation) )
 
     # Retrieve the elevation with the most constraint