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

1 files changed, 13 insertions, 1 deletions

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);
     }
 }