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

Menus optimized in function of Group menus

Browse Source
This commit is contained in:
FlightControl
2016-11-28 15:44:50 +01:00
parent c86b9d1822
commit 522ba96ca1
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Core/Menu.lua
View File

@@ -853,8 +853,8 @@ do
self.MenuText = MenuText self.MenuText = MenuText
self.ParentMenu = ParentMenu self.ParentMenu = ParentMenu
self.MenuGroup._Menu = self.MenuGroup._Menu or {} self.MenuGroup._MenuPath = self.MenuGroup._MenuPath or {}
local MenuPath = self.MenuGroup._Menu local MenuPath = self.MenuGroup._MenuPath
self:E(self.MenuParentPath) self:E(self.MenuParentPath)
self:E( ParentMenu ) self:E( ParentMenu )

10
Moose Development/Moose/Tasking/Mission.lua
View File

@@ -163,8 +163,16 @@ end
-- @param Group#GROUP TaskGroup -- @param Group#GROUP TaskGroup
-- @return Menu#MENU_COALITION self -- @return Menu#MENU_COALITION self
function MISSION:GetMissionMenu( TaskGroup ) function MISSION:GetMissionMenu( TaskGroup )
local CommandCenter = self:GetCommandCenter()
local CommandCenterMenu = CommandCenter.CommandCenterMenu
local MissionName = self:GetName()
local TaskGroupName = TaskGroup:GetName() local TaskGroupName = TaskGroup:GetName()
return self.MenuMission[TaskGroupName] local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu )
return MissionMenu
end end

14
Moose Development/Moose/Tasking/Task.lua
View File

@@ -325,13 +325,9 @@ function TASK_BASE:SetPlannedMenuForGroup( TaskGroup, MenuText )
self:E( TaskGroup:GetName() ) self:E( TaskGroup:GetName() )
local Mission = self:GetMission() local Mission = self:GetMission()
local CommandCenter = Mission:GetCommandCenter() local MissionMenu = Mission:GetMissionMenu( TaskGroup )
local CommandCenterMenu = CommandCenter.CommandCenterMenu
local MissionName = Mission:GetName()
local TaskType = self:GetType() local TaskType = self:GetType()
local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu )
local TaskTypeMenu = MENU_GROUP:New( TaskGroup, TaskType, MissionMenu ) local TaskTypeMenu = MENU_GROUP:New( TaskGroup, TaskType, MissionMenu )
local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, MenuText, TaskTypeMenu, self.MenuAssignToGroup, { self = self, TaskGroup = TaskGroup } ) local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, MenuText, TaskTypeMenu, self.MenuAssignToGroup, { self = self, TaskGroup = TaskGroup } )
@@ -346,14 +342,10 @@ function TASK_BASE:SetAssignedMenuForGroup( TaskGroup )
self:E( TaskGroup:GetName() ) self:E( TaskGroup:GetName() )
local Mission = self:GetMission() local Mission = self:GetMission()
local CommandCenter = Mission:GetCommandCenter() local MissionMenu = Mission:GetMissionMenu( TaskGroup )
local CommandCenterMenu = CommandCenter.CommandCenterMenu
local MissionName = Mission:GetName()
local TaskGroupName = TaskGroup:GetName()
local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu )
self:E( { MissionMenu = MissionMenu } ) self:E( { MissionMenu = MissionMenu } )
local TaskTypeMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Task Status", MissionMenu, self.MenuTaskStatus, { self = self, TaskGroup = TaskGroup } ) local TaskTypeMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Task Status", MissionMenu, self.MenuTaskStatus, { self = self, TaskGroup = TaskGroup } )
local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Abort Task", MissionMenu, self.MenuTaskAbort, { self = self, TaskGroup = TaskGroup } ) local TaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, "Abort Task", MissionMenu, self.MenuTaskAbort, { self = self, TaskGroup = TaskGroup } )

BIN
Moose Training/Presentations/Tasking/DCS World - MOOSE - Tasking.pptx
View File

Binary file not shown.