From 522ba96ca1fb318f066ebd665564dbf0bfd0dae7 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Mon, 28 Nov 2016 15:44:50 +0100 Subject: [PATCH] Menus optimized in function of Group menus --- Moose Development/Moose/Core/Menu.lua | 4 ++-- Moose Development/Moose/Tasking/Mission.lua | 10 +++++++++- Moose Development/Moose/Tasking/Task.lua | 14 +++----------- .../Tasking/DCS World - MOOSE - Tasking.pptx | Bin 5411945 -> 5413199 bytes 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Moose Development/Moose/Core/Menu.lua b/Moose Development/Moose/Core/Menu.lua index 460412973..e27a268da 100644 --- a/Moose Development/Moose/Core/Menu.lua +++ b/Moose Development/Moose/Core/Menu.lua @@ -853,8 +853,8 @@ do self.MenuText = MenuText self.ParentMenu = ParentMenu - self.MenuGroup._Menu = self.MenuGroup._Menu or {} - local MenuPath = self.MenuGroup._Menu + self.MenuGroup._MenuPath = self.MenuGroup._MenuPath or {} + local MenuPath = self.MenuGroup._MenuPath self:E(self.MenuParentPath) self:E( ParentMenu ) diff --git a/Moose Development/Moose/Tasking/Mission.lua b/Moose Development/Moose/Tasking/Mission.lua index dab1479e1..0af1475f8 100644 --- a/Moose Development/Moose/Tasking/Mission.lua +++ b/Moose Development/Moose/Tasking/Mission.lua @@ -163,8 +163,16 @@ end -- @param Group#GROUP TaskGroup -- @return Menu#MENU_COALITION self function MISSION:GetMissionMenu( TaskGroup ) + + local CommandCenter = self:GetCommandCenter() + local CommandCenterMenu = CommandCenter.CommandCenterMenu + + local MissionName = self:GetName() + local TaskGroupName = TaskGroup:GetName() - return self.MenuMission[TaskGroupName] + local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu ) + + return MissionMenu end diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index b1d3ad81a..cb0e1455a 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -325,13 +325,9 @@ function TASK_BASE:SetPlannedMenuForGroup( TaskGroup, MenuText ) self:E( TaskGroup:GetName() ) local Mission = self:GetMission() - local CommandCenter = Mission:GetCommandCenter() - local CommandCenterMenu = CommandCenter.CommandCenterMenu + local MissionMenu = Mission:GetMissionMenu( TaskGroup ) - local MissionName = Mission:GetName() local TaskType = self:GetType() - - local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu ) local TaskTypeMenu = MENU_GROUP:New( TaskGroup, TaskType, MissionMenu ) 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() ) local Mission = self:GetMission() - local CommandCenter = Mission:GetCommandCenter() - local CommandCenterMenu = CommandCenter.CommandCenterMenu + local MissionMenu = Mission:GetMissionMenu( TaskGroup ) - local MissionName = Mission:GetName() - - local TaskGroupName = TaskGroup:GetName() - local MissionMenu = MENU_GROUP:New( TaskGroup, MissionName, CommandCenterMenu ) self:E( { MissionMenu = MissionMenu } ) + 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 } ) diff --git a/Moose Training/Presentations/Tasking/DCS World - MOOSE - Tasking.pptx b/Moose Training/Presentations/Tasking/DCS World - MOOSE - Tasking.pptx index 1336f963c15a19d3776b69cd7c106cf14bd96891..8851df1c5328aa651cc0793a0c081556746690d2 100644 GIT binary patch delta 5542 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 Sy?aO~5-J6Z?5b!8`2Pd)LX~v@ delta 4644 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