fix conflict

2 files changed, 90 insertions, 0 deletions

diff --git a/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/PanelPCApplication/DefaultPanelPCApplicationManager.cs b/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/PanelPCApplication/DefaultPanelPCApplicationManager.cs
new file mode 100644
index 000000000..aa36bb9cd
--- /dev/null
+++ b/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/PanelPCApplication/DefaultPanelPCApplicationManager.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Operation;
+
+namespace Tango.PanelPC.UI.PanelPCApplication
+{
+    public class DefaultPanelPCApplicationManager : IPanelPCApplicationManager
+    {
+        public bool IsShuttingDown
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public IMachineOperator ConnectedMachine
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string Version
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public event EventHandler<IMachineOperator> ConnectedMachineChanged;
+
+        public void ShutDown()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/PanelPCApplication/IPanelPCApplicationManager.cs b/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/PanelPCApplication/IPanelPCApplicationManager.cs
new file mode 100644
index 000000000..fd5b68f3c
--- /dev/null
+++ b/Software/Visual_Studio/PanelPC/Tango.PanelPC.UI/PanelPCApplication/IPanelPCApplicationManager.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using Tango.Integration.Operation;
+using Tango.Integration.Services;
+
+namespace Tango.PanelPC.UI.PanelPCApplication
+{
+    /// <summary>
+    /// Represents the Machine Studio application manager.
+    /// </summary>
+    public interface IPanelPCApplicationManager
+    {
+        /// <summary>
+        /// Occurs when the connected machine property has changed.
+        /// </summary>
+        event EventHandler<IMachineOperator> ConnectedMachineChanged;
+
+        /// <summary>
+        /// Gets a value indicating whether Machine Studio is shutting down.
+        /// </summary>
+        bool IsShuttingDown { get; }
+
+        /// <summary>
+        /// Shutdown the application.
+        /// </summary>
+        void ShutDown();
+
+        /// <summary>
+        /// Gets or sets the currently connected machine if any.
+        /// </summary>
+        IMachineOperator ConnectedMachine { get; set; }
+
+        /// <summary>
+        /// Gets the machine studio application version.
+        /// </summary>
+        String Version { get; }
+    }
+}