Progress

Moose Development/Moose/Core/Point.lua

@@ -412,29 +412,43 @@ do -- COORDINATE
     return ( ( TargetVec3.x - SourceVec3.x ) ^ 2 + ( TargetVec3.y - SourceVec3.y ) ^ 2 + ( TargetVec3.z - SourceVec3.z ) ^ 2 ) ^ 0.5
   end
 
-  --- Provides a Bearing / Range string
+
+  --- Provides a bearing text in degrees.
   -- @param #COORDINATE self
-  -- @param #number AngleRadians The angle in randians
+  -- @param #number AngleRadians The angle in randians.
-  -- @param #number Distance The distance
+  -- @param #number Precision The precision.
-  -- @return #string The BR Text
+  -- @param Core.Settings#SETTINGS Settings
-  function COORDINATE:GetBRText( AngleRadians, Distance, Settings )
+  -- @return #string The bearing text in degrees.
+  function COORDINATE:GetBearingText( AngleRadians, Precision, Settings )
 
-    local Settings = Settings or _SETTINGS
+    local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
-
-    AngleRadians = UTILS.Round( UTILS.ToDegree( AngleRadians ), 0 )
-    if Settings:IsMetric() then
-      Distance = UTILS.Round( Distance / 1000, 2 )
-    else
-      Distance = UTILS.Round( UTILS.MetersToNM( Distance ), 2 )
-    end
-
-    local s = string.format( '%03d', AngleRadians ) .. ' for ' .. Distance
-
-    s = s .. self:GetAltitudeText() -- When the POINT is a VEC2, there will be no altitude shown.
 
+    local AngleDegrees = UTILS.Round( UTILS.ToDegree( AngleRadians ), Precision )
+  
+    local s = string.format( '%03d°', AngleDegrees ) 
+    
     return s
   end
 
+  --- Provides a distance text expressed in the units of measurement.
+  -- @param #COORDINATE self
+  -- @param #number Distance The distance in meters.
+  -- @param Core.Settings#SETTINGS Settings
+  -- @return #string The distance text expressed in the units of measurement.
+  function COORDINATE:GetDistanceText( Distance, Settings )
+
+    local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
+
+    local DistanceText
+
+    if Settings:IsMetric() then
+      DistanceText = " for " .. UTILS.Round( Distance / 1000, 2 ) .. " km"
+    else
+      DistanceText = " for " .. UTILS.Round( UTILS.MetersToNM( Distance ), 2 ) .. " miles"
+    end
+    
+    return DistanceText
+  end
 
   --- Return the altitude text of the COORDINATE.
   -- @param #COORDINATE self
@@ -444,9 +458,9 @@ do -- COORDINATE
     local Settings = Settings or _SETTINGS
     if Altitude ~= 0 then
       if Settings:IsMetric() then
-        return ' at ' .. UTILS.Round( self.y, -3 )
+        return " at" .. UTILS.Round( self.y, -3 ) .. " meters"
       else
-        return ' at ' .. UTILS.Round( UTILS.MetersToFeet( self.y ), -3 )
+        return " at " .. UTILS.Round( UTILS.MetersToFeet( self.y ), -3 ) .. " feet"
       end
     else
       return ""
@@ -454,6 +468,45 @@ do -- COORDINATE
   end
 
 
+  --- Provides a Bearing / Range string
+  -- @param #COORDINATE self
+  -- @param #number AngleRadians The angle in randians
+  -- @param #number Distance The distance
+  -- @param Core.Settings#SETTINGS Settings
+  -- @return #string The BR Text
+  function COORDINATE:GetBRText( AngleRadians, Distance, Settings )
+
+    local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
+
+    local BearingText = self:GetBearingText( AngleRadians, 0, Settings )
+    local DistanceText = self:GetDistanceText( Distance, Settings )
+    
+    local BRText = BearingText .. DistanceText
+
+    return BRText
+  end
+
+  --- Provides a Bearing / Range / Altitude string
+  -- @param #COORDINATE self
+  -- @param #number AngleRadians The angle in randians
+  -- @param #number Distance The distance
+  -- @param Core.Settings#SETTINGS Settings
+  -- @return #string The BRA Text
+  function COORDINATE:GetBRAText( AngleRadians, Distance, Settings )
+
+    local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
+
+    local BearingText = self:GetBearingText( AngleRadians, 0, Settings )
+    local DistanceText = self:GetDistanceText( Distance, Settings )
+    local AltitudeText = self:GetAltitudeText( Settings )
+
+    local BRAText = BearingText .. DistanceText .. AltitudeText -- When the POINT is a VEC2, there will be no altitude shown.
+
+    return BRAText
+  end
+
+
+
   --- Add a Distance in meters from the COORDINATE horizontal plane, with the given angle, and calculate the new COORDINATE.
   -- @param #COORDINATE self
   -- @param Dcs.DCSTypes#Distance Distance The Distance to be added in meters.
@@ -721,7 +774,7 @@ do -- COORDINATE
     local AngleRadians =  self:GetAngleRadians( DirectionVec3 )
     local Distance = FromCoordinate:Get2DDistance( self )
     local Altitude = self:GetAltitudeText()
-    return "BRA, " .. self:GetBRText( AngleRadians, Distance, Settings )
+    return "BRA, " .. self:GetBRAText( AngleRadians, Distance, Settings )
   end
 
   --- Return a BULLS string from a COORDINATE to the BULLS of the coalition.

Moose Development/Moose/Core/Settings.lua

@@ -83,7 +83,8 @@ do -- SETTINGS
   -- @param #SETTINGS self
   -- @return #boolean true if metric.
   function SETTINGS:IsMetric()
-    return self.Metric == true
+    self:E( {Metric = ( self.Metric ~= nil and self.Metric == true ) or ( self.Metric == nil and _SETTINGS:IsMetric() ) } )
+    return ( self.Metric ~= nil and self.Metric == true ) or ( self.Metric == nil and _SETTINGS:IsMetric() )
   end
 
   --- Sets the SETTINGS imperial.
@@ -96,7 +97,8 @@ do -- SETTINGS
   -- @param #SETTINGS self
   -- @return #boolean true if imperial.
   function SETTINGS:IsImperial()
-    return self.Metric == false
+    self:E( {Metric = ( self.Metric ~= nil and self.Metric == false ) or ( self.Metric == nil and _SETTINGS:IsMetric() ) } )
+    return ( self.Metric ~= nil and self.Metric == false ) or ( self.Metric == nil and _SETTINGS:IsMetric() )
   end
 
   --- Sets the SETTINGS LL accuracy.
@@ -221,11 +223,13 @@ do -- SETTINGS
 
   --- @param #SETTINGS self
   -- @return #SETTINGS
-  function SETTINGS:SystemSettingsMenu( RootMenu, MenuText )
+  function SETTINGS:SetSystemMenu( RootMenu, MenuText )
 
     MenuText = MenuText or "System Settings"
   
-    self.SettingsMenu = MENU_MISSION:New( MenuText, RootMenu )
+    if not self.SettingsMenu then
+      self.SettingsMenu = MENU_MISSION:New( MenuText, RootMenu )
+    end
 
     if self.DefaultMenu then
       self.DefaultMenu:Remove()
@@ -270,6 +274,16 @@ do -- SETTINGS
       MENU_MISSION_COMMAND:New( "Activate BULLS", A2ACoordinateMenu, self.A2AMenuSystem, self, "BULLS" )
     end
     
+    local MetricsMenu = MENU_MISSION:New( "Measures and Weights System", self.DefaultMenu )
+    
+    if self:IsMetric() then
+      MENU_MISSION_COMMAND:New( "Activate Imperial", MetricsMenu, self.MenuMWSystem, self, false )
+    end
+    
+    if self:IsImperial() then
+      MENU_MISSION_COMMAND:New( "Activate Metric", MetricsMenu, self.MenuMWSystem, self, true )
+    end    
+    
     return self
   end
 
@@ -297,39 +311,49 @@ do -- SETTINGS
     local A2GCoordinateMenu = MENU_GROUP:New( PlayerGroup, "A2G Coordinate System", PlayerMenu )
   
     if self:IsA2G_LL() then
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BRA", A2GCoordinateMenu, self.GroupA2GMenu, self, PlayerUnit, PlayerGroup, PlayerName, "BRA" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BRA", A2GCoordinateMenu, self.MenuGroupA2GSystem, self, PlayerUnit, PlayerGroup, PlayerName, "BRA" )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate MGRS", A2GCoordinateMenu, self.GroupA2GMenu, self, PlayerUnit, PlayerGroup, PlayerName, "MGRS" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate MGRS", A2GCoordinateMenu, self.MenuGroupA2GSystem, self, PlayerUnit, PlayerGroup, PlayerName, "MGRS" )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Accuracy 1", A2GCoordinateMenu, self.GroupLL_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 1 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Accuracy 1", A2GCoordinateMenu, self.MenuGroupLL_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 1 )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Accuracy 2", A2GCoordinateMenu, self.GroupLL_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 2 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Accuracy 2", A2GCoordinateMenu, self.MenuGroupLL_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 2 )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Accuracy 3", A2GCoordinateMenu, self.GroupLL_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 3 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Accuracy 3", A2GCoordinateMenu, self.MenuGroupLL_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 3 )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Decimal On", A2GCoordinateMenu, self.GroupLL_DMSMenu, self, PlayerUnit, PlayerGroup, PlayerName, true )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Decimal On", A2GCoordinateMenu, self.MenuGroupLL_DMSSystem, self, PlayerUnit, PlayerGroup, PlayerName, true )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Decimal Off", A2GCoordinateMenu, self.GroupLL_DMSMenu, self, PlayerUnit, PlayerGroup, PlayerName, false )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "LL Decimal Off", A2GCoordinateMenu, self.MenuGroupLL_DMSSystem, self, PlayerUnit, PlayerGroup, PlayerName, false )
     end
   
     if self:IsA2G_MGRS() then
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BRA", A2GCoordinateMenu, self.GroupA2GMenu, self, PlayerUnit, PlayerGroup, PlayerName, "BRA" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BRA", A2GCoordinateMenu, self.MenuGroupA2GSystem, self, PlayerUnit, PlayerGroup, PlayerName, "BRA" )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate LL", A2GCoordinateMenu, self.GroupA2GMenu, self, PlayerUnit, PlayerGroup, PlayerName, "LL" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate LL", A2GCoordinateMenu, self.MenuGroupA2GSystem, self, PlayerUnit, PlayerGroup, PlayerName, "LL" )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 1", A2GCoordinateMenu, self.GroupMGRS_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 1 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 1", A2GCoordinateMenu, self.MenuGroupMGRS_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 1 )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 2", A2GCoordinateMenu, self.GroupMGRS_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 2 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 2", A2GCoordinateMenu, self.MenuGroupMGRS_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 2 )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 3", A2GCoordinateMenu, self.GroupMGRS_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 3 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 3", A2GCoordinateMenu, self.MenuGroupMGRS_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 3 )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 4", A2GCoordinateMenu, self.GroupMGRS_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 4 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 4", A2GCoordinateMenu, self.MenuGroupMGRS_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 4 )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 5", A2GCoordinateMenu, self.GroupMGRS_AccuracyMenu, self, PlayerUnit, PlayerGroup, PlayerName, 5 )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "MGRS Accuracy 5", A2GCoordinateMenu, self.MenuGroupMGRS_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 5 )
     end
 
     if self:IsA2G_BRA() then
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate MGRS", A2GCoordinateMenu, self.GroupA2GMenu, self, PlayerUnit, PlayerGroup, PlayerName, "MGRS" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate MGRS", A2GCoordinateMenu, self.MenuGroupA2GSystem, self, PlayerUnit, PlayerGroup, PlayerName, "MGRS" )
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate LL", A2GCoordinateMenu, self.GroupA2GMenu, self, PlayerUnit, PlayerGroup, PlayerName, "LL" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate LL", A2GCoordinateMenu, self.MenuGroupA2GSystem, self, PlayerUnit, PlayerGroup, PlayerName, "LL" )
     end
 
     local A2ACoordinateMenu = MENU_GROUP:New( PlayerGroup, "A2A Coordinate System", PlayerMenu )
 
     if self:IsA2A_BULLS() then
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BRA", A2ACoordinateMenu, self.GroupA2AMenu, self, PlayerUnit, PlayerGroup, PlayerName, "BRA" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BRA", A2ACoordinateMenu, self.MenuGroupA2ASystem, self, PlayerUnit, PlayerGroup, PlayerName, "BRA" )
     end
   
     if self:IsA2A_BRA() then
-      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BULLS", A2ACoordinateMenu, self.GroupA2AMenu, self, PlayerUnit, PlayerGroup, PlayerName, "BULLS" )
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate BULLS", A2ACoordinateMenu, self.MenuGroupA2ASystem, self, PlayerUnit, PlayerGroup, PlayerName, "BULLS" )
     end
+
+    local MetricsMenu = MENU_GROUP:New( PlayerGroup, "Measures and Weights System", PlayerMenu )
+    
+    if self:IsMetric() then
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate Imperial", MetricsMenu, self.MenuGroupMWSystem, self, PlayerUnit, PlayerGroup, PlayerName, false )
+    end
+    
+    if self:IsImperial() then
+      MENU_GROUP_COMMAND:New( PlayerGroup, "Activate Metric", MetricsMenu, self.MenuGroupMWSystem, self, PlayerUnit, PlayerGroup, PlayerName, true )
+    end    
     
     return self
   end
@@ -351,35 +375,43 @@ do -- SETTINGS
   --- @param #SETTINGS self
   function SETTINGS:A2GMenuSystem( A2GSystem )
     self.A2GSystem = A2GSystem
-    self:SystemSettingsMenu()
+    self:SetSystemMenu()
   end
 
   --- @param #SETTINGS self
   function SETTINGS:A2AMenuSystem( A2ASystem )
     self.A2ASystem = A2ASystem
-    self:SystemSettingsMenu()
+    self:SetSystemMenu()
   end
 
   --- @param #SETTINGS self
   function SETTINGS:MenuLL_Accuracy( LL_Accuracy )
     self.LL_Accuracy = LL_Accuracy
-    self:SystemSettingsMenu()
+    self:SetSystemMenu()
   end
 
   --- @param #SETTINGS self
   function SETTINGS:MenuLL_DMS( LL_DMS )
     self.LL_DMS = LL_DMS
-    self:SystemSettingsMenu()
+    self:SetSystemMenu()
   end
+
   --- @param #SETTINGS self
   function SETTINGS:MenuMGRS_Accuracy( MGRS_Accuracy )
     self.MGRS_Accuracy = MGRS_Accuracy
-    self:SystemSettingsMenu()
+    self:SetSystemMenu()
+  end
+
+  --- @param #SETTINGS self
+  function SETTINGS:MenuMWSystem( MW )
+    self.Metric = MW
+    MESSAGE:New( string.format("Settings: Default measurement format set to %s for all players!.", MW and "Metric" or "Imperial" ), 5 ):ToAll()
+    self:SetSystemMenu()
   end
 
   do
     --- @param #SETTINGS self
-    function SETTINGS:GroupA2GMenu( PlayerUnit, PlayerGroup, PlayerName, A2GSystem )
+    function SETTINGS:MenuGroupA2GSystem( PlayerUnit, PlayerGroup, PlayerName, A2GSystem )
       BASE:E( {self, PlayerUnit:GetName(), A2GSystem} )
       self.A2GSystem = A2GSystem
       MESSAGE:New( string.format("Settings: A2G format set to %s for player %s.", A2GSystem, PlayerName ), 5 ):ToGroup( PlayerGroup )
@@ -388,7 +420,7 @@ do -- SETTINGS
     end
   
     --- @param #SETTINGS self
-    function SETTINGS:GroupA2AMenu( PlayerUnit, PlayerGroup, PlayerName, A2ASystem )
+    function SETTINGS:MenuGroupA2ASystem( PlayerUnit, PlayerGroup, PlayerName, A2ASystem )
       self.A2ASystem = A2ASystem
       MESSAGE:New( string.format("Settings: A2A format set to %s for player %s.", A2ASystem, PlayerName ), 5 ):ToGroup( PlayerGroup )
       self:RemovePlayerMenu(PlayerUnit)
@@ -396,7 +428,7 @@ do -- SETTINGS
     end
   
     --- @param #SETTINGS self
-    function SETTINGS:GroupLL_AccuracyMenu( PlayerUnit, PlayerGroup, PlayerName, LL_Accuracy )
+    function SETTINGS:MenuGroupLL_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, LL_Accuracy )
       self.LL_Accuracy = LL_Accuracy
       MESSAGE:New( string.format("Settings: A2G LL format accuracy set to %d for player %s.", LL_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup )
       self:RemovePlayerMenu(PlayerUnit)
@@ -404,19 +436,28 @@ do -- SETTINGS
     end
   
     --- @param #SETTINGS self
-    function SETTINGS:GroupLL_DMSMenu( PlayerUnit, PlayerGroup, PlayerName, LL_DMS )
+    function SETTINGS:MenuGroupLL_DMSSystem( PlayerUnit, PlayerGroup, PlayerName, LL_DMS )
       self.LL_DMS = LL_DMS
       MESSAGE:New( string.format("Settings: A2G LL format mode set to %s for player %s.", LL_DMS and "DMS" or "HMS", PlayerName ), 5 ):ToGroup( PlayerGroup )
       self:RemovePlayerMenu(PlayerUnit)
       self:SetPlayerMenu(PlayerUnit)
     end
+
     --- @param #SETTINGS self
-    function SETTINGS:GroupMGRS_AccuracyMenu( PlayerUnit, PlayerGroup, PlayerName, MGRS_Accuracy )
+    function SETTINGS:MenuGroupMGRS_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, MGRS_Accuracy )
       self.MGRS_Accuracy = MGRS_Accuracy
       MESSAGE:New( string.format("Settings: A2G MGRS format accuracy set to %d for player %s.", MGRS_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup )
       self:RemovePlayerMenu(PlayerUnit)
       self:SetPlayerMenu(PlayerUnit)
     end
+
+    --- @param #SETTINGS self
+    function SETTINGS:MenuGroupMWSystem( PlayerUnit, PlayerGroup, PlayerName, MW )
+      self.Metrics = MW
+      MESSAGE:New( string.format("Settings: Measurement format set to %s for player %s.", MW and "Metric" or "Imperial", PlayerName ), 5 ):ToGroup( PlayerGroup )
+      self:RemovePlayerMenu(PlayerUnit)
+      self:SetPlayerMenu(PlayerUnit)
+    end
   
   end
 

Moose Development/Moose/Moose.lua

@@ -10,4 +10,4 @@ _SCHEDULEDISPATCHER = SCHEDULEDISPATCHER:New() -- Core.Timer#SCHEDULEDISPATCHER
 _DATABASE = DATABASE:New() -- Database#DATABASE
 
 _SETTINGS = SETTINGS:Set()
-_SETTINGS:SystemSettingsMenu( nil )
+_SETTINGS:SetSystemMenu( nil )