FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented Message Types

Browse Source 
* Added Message Type Methods
* SETTINGS menu has been added with Message Type display times
* Modifed the FSM action classes to use the new Message Type methods.
This commit is contained in:
FlightControl_Master
2017-09-12 11:41:52 +02:00
parent 8a8c496c64
commit 6d1385a031
9 changed files with 316 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Moose Development/Moose/Core/Point.lua
View File

@@ -338,17 +338,7 @@ do -- COORDINATE
-- @return #string
function COORDINATE:GetMovingText( Settings )
local MovingText = ""
local Velocity = self:GetVelocity()
if Velocity == 0 then
MovingText = MovingText .. "stationary "
else
MovingText = MovingText .. "moving at " .. self:GetVelocityText( Settings ) .. " " .. self:GetHeadingText( Settings )
end
return MovingText
return self:GetVelocityText( Settings ) .. self:GetHeadingText( Settings )
end
@@ -481,12 +471,12 @@ do -- COORDINATE
local Settings = Settings or _SETTINGS
if Velocity then
if Settings:IsMetric() then
return UTILS.MpsToKmph( Velocity ) .. " km/h"
return string.format( " moving at %d km/h", UTILS.MpsToKmph( Velocity ) )
else
return UTILS.MpsToKmph( Velocity ) / 1.852 .. " mph"
return string.format( " moving at %d mi/h", UTILS.MpsToKmph( Velocity ) / 1.852 )
end
else
return ""
return " stationary"
end
end
@@ -498,7 +488,7 @@ do -- COORDINATE
local Heading = self.Heading
local Settings = Settings or _SETTINGS
if Heading then
return Heading .. "°"
return string.format( " heading %3.2f °", Heading )
else
return ""
end