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

3 files changed, 28 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
index cb4611cad..3663eb093 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
@@ -220,7 +220,7 @@ namespace Tango.MachineStudio.Common.EventLogging
                 }
 
                 LogManager.Log("Logging event " + machineEvent.EventType.Name + " - " + machineEvent.Description);
-                machineEvent.MachineGuid = _application.ConnectedMachine.Machine.Guid;
+                machineEvent.MachineGuid = _application.Machine.Guid;
                 machineEvent.UserGuid = _authentication.CurrentUser.Guid;
                 machineEvent.User = _authentication.CurrentUser;
                 _events.Enqueue(machineEvent);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 706f82774..f54611d9c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -46,13 +46,27 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public Rect LastBounds { get; set; }
 
+        /// <summary>
+        /// Gets or sets the default issue report assign to.
+        /// </summary>
         public String DefaultIssueReportAssignTo { get; set; }
 
+        /// <summary>
+        /// Gets or sets the default issue report area.
+        /// </summary>
         public String DefaultIssueReportArea { get; set; }
 
+        /// <summary>
+        /// Gets or sets the default issue report tags.
+        /// </summary>
         public List<String> DefaultIssueReportTags { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether add external bridge client emulator when scanning for connected machines.
+        /// </summary>
+        public bool UseExternalBridgeEmulator { get; set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MachineStudio"/> class.
         /// </summary>
         public MachineStudioSettings()
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs
index 96de3eea0..1a0499f2c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using Tango.BL.Entities;
 using Tango.Integration.ExternalBridge;
 
 namespace Tango.MachineStudio.Common.StudioApplication
@@ -32,7 +33,12 @@ namespace Tango.MachineStudio.Common.StudioApplication
         /// <summary>
         /// Gets or sets the currently connected machine if any.
         /// </summary>
-        IExternalBridgeClient ConnectedMachine { get; set; }
+        IExternalBridgeClient ConnectedMachine { get; }
+
+        /// <summary>
+        /// Gets or sets the machine.
+        /// </summary>
+        Machine Machine { get; }
 
         /// <summary>
         /// Gets a value indicating whether the <see cref="ConnectedMachine"/> is valid.
@@ -75,5 +81,11 @@ namespace Tango.MachineStudio.Common.StudioApplication
         /// Raises the application ready event.
         /// </summary>
         void NotifyApplicationReady();
+
+        /// <summary>
+        /// Sets the connected machine.
+        /// </summary>
+        /// <param name="connectedMachine">The connected machine.</param>
+        void SetConnectedMachine(IExternalBridgeClient connectedMachine);
     }
 }