Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 30 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 06b4dca7c..a59ecf8e0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -14,6 +14,8 @@ using System.Collections;
 using Tango.Integration.Services;
 using Tango.Core;
 using Tango.Logging;
+using Tango.MachineStudio.Common.Modules;
+using Tango.MachineStudio.Common;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
@@ -24,17 +26,16 @@ namespace Tango.MachineStudio.UI.StudioApplication
     /// <seealso cref="Tango.MachineStudio.Common.StudioApplication.IStudioApplicationManager" />
     public class DefaultStudioApplicationManager : ExtendedObject, IStudioApplicationManager
     {
-        /// <summary>
-        /// The navigation manager
-        /// </summary>
         private INavigationManager _navigationManager;
+        private IStudioModuleLoader _moduleLoader;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DefaultStudioApplicationManager" /> class.
         /// </summary>
         /// <param name="navigationManager">The navigation manager.</param>
-        public DefaultStudioApplicationManager(INavigationManager navigationManager)
+        public DefaultStudioApplicationManager(INavigationManager navigationManager, IStudioModuleLoader moduleLoader)
         {
+            _moduleLoader = moduleLoader;
             _navigationManager = navigationManager;
         }
 
@@ -146,5 +147,30 @@ namespace Tango.MachineStudio.UI.StudioApplication
 
             });
         }
+
+        /// <summary>
+        /// Loads the specified module if permitted.
+        /// </summary>
+        /// <param name="moduleName">Name of the module.</param>
+        /// <param name="args">The arguments.</param>
+        public void RequestModule(string moduleName, object args)
+        {
+            IStudioModule module = _moduleLoader.UserModules.SingleOrDefault(x => x.Name == moduleName);
+
+            if (module != null)
+            {
+                ServiceLocator.Current.GetInstance<ViewModels.MainViewVM>().StartModule(module);
+
+                //Notify request listeners.
+                foreach (var vm in ServiceLocator.Current.GetAllInstancesByBase<IModuleRequestListener>())
+                {
+                    vm.OnRequestModule(module, args);
+                }
+            }
+            else
+            {
+                throw new InvalidOperationException("The module was not found or you do not have sufficient privileges.");
+            }
+        }
     }
 }