diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua index 1dc346faa..762b5836e 100644 --- a/Moose Development/Moose/Core/Point.lua +++ b/Moose Development/Moose/Core/Point.lua @@ -1036,7 +1036,7 @@ end --- Return no text for the altitude of the POINT_VEC2. -- @param #POINT_VEC2 self -- @return #string Empty string. -function POINT_VEC2:GetAltitudeText() +function POINT_VEC2:GetAltitudeText() return '' end @@ -1045,7 +1045,7 @@ end -- @param Dcs.DCSTypes#Distance Distance The Distance to be added in meters. -- @param Dcs.DCSTypes#Angle Angle The Angle in degrees. -- @return #POINT_VEC2 The new calculated POINT_VEC2. -function POINT_VEC2:Translate( Distance, Angle ) +function POINT_VEC2:Translate( Distance, Angle ) local SX = self:GetX() local SY = self:GetY() local Radians = Angle / 180 * math.pi @@ -1065,7 +1065,7 @@ do -- COORDINATE -- @param Dcs.DCSTypes#Distance y The y coordinate of the Vec3 point, pointing to the Right. -- @param Dcs.DCSTypes#Distance LandHeightAdd (optional) The default height if required to be evaluated will be the land height of the x, y coordinate. You can specify an extra height to be added to the land height. -- @return Core.Point#COORDINATE - function COORDINATE:New( x, y, LandHeightAdd ) + function COORDINATE:New( x, y, LandHeightAdd ) --R2.1 Fixes issue #424. self = BASE:Inherit( self, POINT_VEC2:New( x, y, LandHeightAdd ) ) -- Core.Point#COORDINATE self:F2( self ) @@ -1078,7 +1078,7 @@ do -- COORDINATE -- @param Dcs.DCSTypes#Vec2 Vec2 The Vec2 point. -- @param Dcs.DCSTypes#Distance LandHeightAdd (optional) The default height if required to be evaluated will be the land height of the x, y coordinate. You can specify an extra height to be added to the land height. -- @return Core.Point#COORDINATE self - function COORDINATE:NewFromVec2( Vec2, LandHeightAdd ) + function COORDINATE:NewFromVec2( Vec2, LandHeightAdd ) --R2.1 Fixes issue #424. self = BASE:Inherit( self, POINT_VEC2:NewFromVec2( Vec2, LandHeightAdd ) ) -- Core.Point#COORDINATE self:F2( self ) @@ -1090,7 +1090,7 @@ do -- COORDINATE -- @param #COORDINATE self -- @param Dcs.DCSTypes#Vec3 Vec3 The Vec3 point. -- @return Core.Point#COORDINATE self - function COORDINATE:NewFromVec3( Vec3 ) + function COORDINATE:NewFromVec3( Vec3 ) --R2.1 Fixes issue #424. self = BASE:Inherit( self, POINT_VEC2:NewFromVec3( Vec3 ) ) -- Core.Point#COORDINATE self:F2( self ) @@ -1105,7 +1105,7 @@ do -- COORDINATE -- @param #number LL_Accuracy The accurancy of significant numbers behind the comma... So Accurancy of 2 is 0.01. -- @param #boolean LL_DMS true = Degrees, Minutes, Seconds; false = Degrees, Minutes -- @return #string The LL Text - function COORDINATE:ToStringLL( LL_Accuracy, LL_DMS ) + function COORDINATE:ToStringLL( LL_Accuracy, LL_DMS ) --R2.1 Fixes issue #424. LL_Accuracy = LL_Accuracy or self.LL_Accuracy LL_DMS = LL_DMS or self.LL_DMS @@ -1123,7 +1123,7 @@ do -- COORDINATE -- * 3 = 3 digits - precision level 100 m -- * 4 = 4 digits - precision level 10 m. -- @return #string The MGRS Text - function COORDINATE:ToStringMGRS( MGRS_Accuracy ) + function COORDINATE:ToStringMGRS( MGRS_Accuracy ) --R2.1 Fixes issue #424. MGRS_Accuracy = MGRS_Accuracy or self.MGRS_Accuracy local lat, lon = coord.LOtoLL( self:GetVec3() ) @@ -1137,7 +1137,7 @@ do -- COORDINATE -- -- @param #COORDINATE self -- @return #string The coordinate Text in the configured coordinate system. - function COORDINATE:ToString() --R2.3 + function COORDINATE:ToString() --R2.1 Fixes issue #424. local Coordinate = COORDINATE -- Core.Point#COORDINATE @@ -1157,7 +1157,7 @@ do -- COORDINATE --- @param #COORDINATE self -- @return #string The coordinate Text in the configured coordinate system. - function COORDINATE:CoordinateMenu( RootMenu ) --R2.1 + function COORDINATE:CoordinateMenu( RootMenu ) --R2.1 Fixes issue #424. if self.SystemMenu then self.SystemMenu:Remove() @@ -1190,24 +1190,24 @@ do -- COORDINATE end --- @param #COORDINATE self - function COORDINATE:MenuSystem( System ) --R2.1 + function COORDINATE:MenuSystem( System ) --R2.1 Fixes issue #424. self.System = System self:CoordinateMenu() end --- @param #COORDINATE self - function COORDINATE:MenuLL_Accuracy( LL_Accuracy ) --R2.1 + function COORDINATE:MenuLL_Accuracy( LL_Accuracy ) --R2.1 Fixes issue #424. self.LL_Accuracy = LL_Accuracy self:CoordinateMenu() end --- @param #COORDINATE self - function COORDINATE:MenuLL_DMS( LL_DMS ) --R2.1 + function COORDINATE:MenuLL_DMS( LL_DMS ) --R2.1 Fixes issue #424. self.LL_DMS = LL_DMS self:CoordinateMenu() end --- @param #COORDINATE self - function COORDINATE:MenuMGRS_Accuracy( MGRS_Accuracy ) --R2.1 + function COORDINATE:MenuMGRS_Accuracy( MGRS_Accuracy ) --R2.1 Fixes issue #424. self.MGRS_Accuracy = MGRS_Accuracy self:CoordinateMenu() end diff --git a/Moose Development/Moose/Tasking/CommandCenter.lua b/Moose Development/Moose/Tasking/CommandCenter.lua index 04e8d62c2..f24527cbb 100644 --- a/Moose Development/Moose/Tasking/CommandCenter.lua +++ b/Moose Development/Moose/Tasking/CommandCenter.lua @@ -31,7 +31,7 @@ end -- @param #REPORT self -- @param #number Indent -- @return #REPORT -function REPORT:SetIndent( Indent ) +function REPORT:SetIndent( Indent ) --R2.1 self.Indent = Indent return self end @@ -50,7 +50,7 @@ end -- @param #REPORT self -- @param #string Text -- @return #REPORT -function REPORT:AddIndent( Text ) +function REPORT:AddIndent( Text ) --R2.1 self.Report[#self.Report+1] = string.rep(" ", self.Indent ) .. Text:gsub("\n","\n"..string.rep( " ", self.Indent ) ) return self end diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index 918a6b760..e9519290e 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -542,7 +542,7 @@ end -- @param #TASK self -- @param #number MenuTime -- @return #TASK -function TASK:SetMenu( MenuTime ) +function TASK:SetMenu( MenuTime ) --R2.1 Mission Reports and Task Reports added. Fixes issue #424. self:F() self.SetGroup:Flush() @@ -1153,7 +1153,7 @@ do -- Reporting -- List the Task Name and Status -- @param #TASK self -- @return #string -function TASK:ReportSummary() +function TASK:ReportSummary() --R2.1 fixed report. Now nicely formatted and contains the info required. local Report = REPORT:New() @@ -1172,7 +1172,7 @@ end -- List the Task Name and Status -- @param #TASK self -- @return #string -function TASK:ReportOverview() +function TASK:ReportOverview() --R2.1 fixed report. Now nicely formatted and contains the info required. local Report = REPORT:New() @@ -1194,7 +1194,7 @@ end -- List the Task Status, and the Players assigned to the Task. -- @param #TASK self -- @return #string -function TASK:ReportDetails() +function TASK:ReportDetails() --R2.1 fixed report. Now nicely formatted and contains the info required. local Report = REPORT:New():SetIndent( 3 )