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

16 files changed, 156 insertions, 69 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
index 1dfe4c18f..b8a6cd1c0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:views="clr-namespace:Tango.MachineStudio.UI.Views"
         xmlns:sharedControls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
         mc:Ignorable="d"
-        Title="Tango" Height="800" Width="1280" WindowStartupLocation="CenterOwner" WindowState="Maximized" Foreground="#494949" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}">
+        Title="Tango" Height="800" Width="1280" Foreground="#494949" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}">
 
     <Grid>
         <Grid.Background>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
index 9901d3b80..f0f93a867 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
@@ -18,7 +18,9 @@ using System.Windows.Shapes;
 using Tango.Core.DI;
 using Tango.Core.Helpers;
 using Tango.Logging;
+using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.StudioApplication;
+using Tango.Settings;
 
 namespace Tango.MachineStudio.UI
 {
@@ -37,10 +39,20 @@ namespace Tango.MachineStudio.UI
             try
             {
                 InitializeComponent();
+
+                WindowStartupLocation = WindowStartupLocation.Manual;
+
+                var r = SettingsManager.Default.GetOrCreate<MachineStudioSettings>().LastBounds;
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    Left = r.Left;
+                }
+
                 Instance = this;
                 ThreadsHelper.SetDisptacher(Dispatcher);
 
-                this.Closing += MainWindow_Closing; 
+                Closing += MainWindow_Closing; 
             }
             catch (Exception ex)
             {
@@ -49,6 +61,12 @@ namespace Tango.MachineStudio.UI
 
             this.Loaded += MainWindow_Loaded;
             this.SizeChanged += MainWindow_SizeChanged;
+            ContentRendered += MainWindow_ContentRendered;
+        }
+
+        private void MainWindow_ContentRendered(object sender, EventArgs e)
+        {
+            WindowState = WindowState.Maximized;
         }
 
         private void MainWindow_SizeChanged(object sender, SizeChangedEventArgs e)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 5f541f597..121d4ab07 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("2.0.9.18206")]
+[assembly: AssemblyVersion("2.1.12.18210")]
 [assembly: ComVisible(false)]
\ No newline at end of file
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 d33b12a17..c7ac60ace 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -15,7 +15,7 @@ using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common;
 using Tango.Settings;
 using System.Windows;
-using Tango.Integration.Services;
+using Tango.Integration.ExternalBridge;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.BL.Enumerations;
 using Tango.Core.DI;
@@ -135,7 +135,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return AssemblyHelper.GetCurrentAssemblyVersion().ToString(3);
+                return AssemblyHelper.GetCurrentAssemblyVersion().ToString(4);
             }
         }
 
@@ -148,76 +148,92 @@ namespace Tango.MachineStudio.UI.StudioApplication
 
             IsShuttingDown = true;
 
-            await Task.Factory.StartNew(async () =>
+            try
             {
+                Rect r = new Rect(
+                        MainWindow.Instance.Left,
+                        MainWindow.Instance.Top,
+                        MainWindow.Instance.Width,
+                        MainWindow.Instance.Height);
+
+                await Task.Factory.StartNew(async () =>
+                {
                 //Do Shutdown Procedures...
                 foreach (var vm in TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>())
-                {
-                    try
                     {
-                        var result = await vm.OnShutdownRequest();
-                        if (!result)
+                        try
+                        {
+                            var result = await vm.OnShutdownRequest();
+                            if (!result)
+                            {
+                                IsShuttingDown = false;
+                                return;
+                            }
+                        }
+                        catch (Exception ex)
                         {
-                            IsShuttingDown = false;
-                            return;
+                            LogManager.Log(ex, "Error on shutdown request with " + vm.GetType().Name);
                         }
                     }
-                    catch (Exception ex)
+
+                    foreach (var vm in TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>())
                     {
-                        LogManager.Log(ex, "Error on shutdown request with " + vm.GetType().Name);
+                        vm.OnShuttingDown();
                     }
-                }
 
-                foreach (var vm in TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>())
-                {
-                    vm.OnShuttingDown();
-                }
+                    SettingsManager.Default.GetOrCreate<MachineStudioSettings>().LastBounds = r;
 
-                try
-                {
-                    SettingsManager.Default.Save();
-                }
-                catch (Exception ex)
-                {
-                    LogManager.Log(ex, "Error saving settings.");
-                }
+                    try
+                    {
+                        SettingsManager.Default.Save();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error saving settings.");
+                    }
 
-                _navigationManager.NavigateTo(NavigationView.ShutdownView);
+                    _navigationManager.NavigateTo(NavigationView.ShutdownView);
 
-                Thread.Sleep(1500);
+                    Thread.Sleep(1500);
 
-                foreach (var window in _openedWindows)
-                {
-                    ThreadsHelper.InvokeUI(() =>
+                    foreach (var window in _openedWindows)
                     {
-                        window.Close();
-                    });
-                }
+                        ThreadsHelper.InvokeUI(() =>
+                        {
+                            window.Close();
+                        });
+                    }
 
-                try
-                {
-                    if (ConnectedMachine != null)
+                    try
                     {
-                        ConnectedMachine.Disconnect().Wait();
+                        if (ConnectedMachine != null)
+                        {
+                            ConnectedMachine.Disconnect().Wait();
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error disconnecting from machine.");
                     }
-                }
-                catch (Exception ex)
-                {
-                    LogManager.Log(ex, "Error disconnecting from machine.");
-                }
 
-                var eventLogger = TangoIOC.Default.GetInstance<IEventLogger>();
-                if (eventLogger != null)
-                {
-                    eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!");
-                    eventLogger.FlushAll();
-                }
+                    var eventLogger = TangoIOC.Default.GetInstance<IEventLogger>();
+                    if (eventLogger != null)
+                    {
+                        eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!");
+                        eventLogger.FlushAll();
+                    }
 
-                Thread.Sleep(1500);
+                    Thread.Sleep(1500);
 
-                Environment.Exit(0);
+                    Environment.Exit(0);
 
-            });
+                });
+            }
+            catch (Exception ex)
+            {
+                IsShuttingDown = false;
+                LogManager.Log(ex,"An error occurred while shutting down machine studio.");
+            }
         }
 
         /// <summary>
@@ -264,7 +280,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return typeof(ExtendedObject).Assembly.GetName().Version.ToString(3); 
+                return typeof(ExtendedObject).Assembly.GetName().Version.ToString(3);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 8a5ce3d8b..2c816eb6c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -1,6 +1,6 @@
 using System;
 using Tango.Core.DI;
-using Tango.Integration.Services;
+using Tango.Integration.ExternalBridge;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Diagnostics;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs
index 5fe3b06b8..0b8a205f7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core;
 using Tango.MachineStudio.Common.StudioApplication;
+using Tango.Settings;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.UI.ViewModels
@@ -12,9 +14,12 @@ namespace Tango.MachineStudio.UI.ViewModels
     {
         public IStudioApplicationManager ApplicationManager { get; set; }
 
+        public CoreSettings Settings { get; set; }
+
         public AboutViewVM(IStudioApplicationManager applicationManager)
         {
             ApplicationManager = applicationManager;
+            Settings = SettingsManager.Default.GetOrCreate<CoreSettings>();
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
index 8034ceb69..35a4b0e9d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.SharedUI;
@@ -30,18 +31,28 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         public ConnectedMachineVMResult Result { get; set; }
 
+        private IDiagnosticsFrameProvider _diagnosticsFrameProvider;
+        public IDiagnosticsFrameProvider DiagnosticsFrameProvider
+        {
+            get { return _diagnosticsFrameProvider; }
+            set { _diagnosticsFrameProvider = value; RaisePropertyChangedAuto(); }
+        }
+
+
         public RelayCommand DisconnectCommand { get; set; }
 
         public RelayCommand UploadHardwareConfigurationCommand { get; set; }
 
         public RelayCommand ResetCommand { get; set; }
 
-        public ConnectedMachineViewVM(IStudioApplicationManager application)
+        public ConnectedMachineViewVM(IStudioApplicationManager application, IDiagnosticsFrameProvider frameProvider)
         {
             ApplicationManager = application;
             DisconnectCommand = new RelayCommand(Disconnect);
             UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
             ResetCommand = new RelayCommand(Reset);
+
+            DiagnosticsFrameProvider = frameProvider;
         }
 
         private void Reset()
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 26be2d16b..a7750b39c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -19,6 +19,8 @@ using Tango.MachineStudio.UI.TFS;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Update;
 using Tango.Core.DI;
+using Tango.Settings;
+using Tango.Core;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
@@ -37,13 +39,19 @@ namespace Tango.MachineStudio.UI.ViewModels
         public IStudioApplicationManager ApplicationManager { get; set; }
 
         private bool _isLoading;
-
         public bool IsLoading
         {
             get { return _isLoading; }
             set { _isLoading = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _status;
+        public String Status
+        {
+            get { return _status; }
+            set { _status = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LoadingViewVM"/> class.
         /// </summary>
@@ -52,6 +60,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <param name="notificationProvider">The notification provider.</param>
         public LoadingViewVM(IStudioApplicationManager applicationManager, INavigationManager navigationManager, IStudioModuleLoader studioModuleLoader, INotificationProvider notificationProvider, IEventLogger eventLogger, TeamFoundationServiceExtendedClient teamFoundationClient)
         {
+            Status = "Loading, please wait...";
             _tfs = teamFoundationClient;
             _eventLogger = eventLogger;
             ApplicationManager = applicationManager;
@@ -79,6 +88,8 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     try
                     {
+                        Status = "Checking for critical updates...";
+
                         LogManager.Log("Checking for forced update...");
                         var service = UpdateServiceHelper.GetUpdateServiceChannel();
                         var client = service.CreateChannel();
@@ -119,17 +130,23 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                     try
                     {
+                        Status = "Connecting to Team Foundation Services...";
                         _tfs.Initialize();
+                        Thread.Sleep(500);
                     }
                     catch (Exception ex)
                     {
                         LogManager.Log(ex, "Could not initialize Team Foundation Service client.");
                     }
 
+                    Status = "Loading, please wait...";
+
                     ObservablesEntitiesAdapter.Instance.Initialize();
 
                     _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
 
+                    Status = "Starting application...";
+
                     InvokeUI(() =>
                     {
                         _studioModuleLoader.LoadModules();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 3cd3fb5f9..60447f37a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
-using Tango.Integration.Services;
+using Tango.Integration.ExternalBridge;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.SharedUI;
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 278926de9..e53ec0b39 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -13,7 +13,7 @@ using System.Windows.Media;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.Core.DI;
-using Tango.Integration.Services;
+using Tango.Integration.ExternalBridge;
 using Tango.Logging;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
@@ -451,7 +451,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                                         await x.SelectedMachine.Connect();
 
-                                        var authenticated = await x.SelectedMachine.As<IExternalBridgeSecureClient>().Authenticate(login.Password);
+                                        var authenticated = await x.SelectedMachine.As<IExternalBridgeSecureClient>().Authenticate(login.Password, Environment.MachineName, AuthenticationProvider.CurrentUser.Guid, "Machine Studio");
                                         if (!authenticated)
                                         {
                                             _notificationProvider.ShowError("It seems like you are not authorized to access the selected machine.");
@@ -459,6 +459,14 @@ namespace Tango.MachineStudio.UI.ViewModels
                                         else
                                         {
                                             ApplicationManager.ConnectedMachine = x.SelectedMachine;
+                                            (x.SelectedMachine as IExternalBridgeSecureClient).SessionClosed += (_, __) =>
+                                            {
+                                                InvokeUI(() =>
+                                                {
+                                                    _notificationProvider.ShowError("The remote machine has closed the current session. Machine disconnected.");
+                                                    ApplicationManager.ConnectedMachine = null;
+                                                });
+                                            };
                                             PostMessage(new MachineConnectionChangedMessage() { Machine = x.SelectedMachine });
                                             _eventLogger.Log(String.Format("Successfully connected to machine {0} via TCP", x.SelectedMachine.SerialNumber));
                                         }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 2ac0df9de..0f8bceac7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -36,13 +36,15 @@
 
 
 
-                        <controls:TableGrid RowHeight="30" Height="120" DockPanel.Dock="Top">
+                        <controls:TableGrid RowHeight="25" Height="120" DockPanel.Dock="Top">
                             <TextBlock FontWeight="SemiBold">Machine Studio:</TextBlock>
                             <TextBlock><Run>v</Run><Run Text="{Binding ApplicationManager.Version,Mode=OneWay}"></Run></TextBlock>
                             <TextBlock FontWeight="SemiBold">Core Libraries:</TextBlock>
                             <TextBlock><Run>v</Run><Run Text="{Binding ApplicationManager.CoreVersion,Mode=OneWay}"></Run></TextBlock>
                             <TextBlock FontWeight="SemiBold">Build Date:</TextBlock>
                             <TextBlock Text="{Binding ApplicationManager.BuildDate,Mode=OneWay}"></TextBlock>
+                            <TextBlock FontWeight="SemiBold">Data Source:</TextBlock>
+                            <TextBlock Text="{Binding Settings.DataBaseSource,Mode=OneWay}"></TextBlock>
                         </controls:TableGrid>
 
                         <DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index 39c42392d..aa2b014fe 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -4,14 +4,14 @@
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:integration="clr-namespace:Tango.Integration.Services;assembly=Tango.Integration"
+             xmlns:integration="clr-namespace:Tango.Integration.ExternalBridge;assembly=Tango.Integration"
              xmlns:integ="clr-namespace:Tango.Integration.Operation;assembly=Tango.Integration"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-              d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="400" Background="White" DataContext="{Binding ConnectedMachineViewVM, Source={StaticResource Locator}}">
+              d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="420" Background="White" DataContext="{Binding ConnectedMachineViewVM, Source={StaticResource Locator}}">
 
     <UserControl.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
@@ -73,7 +73,12 @@
                                     <TextBlock FontWeight="SemiBold" Text="Transfer Rate:" />
                                     <TextBlock>
                                         <Run Text="{Binding Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
-                                        <Run Text="/ second"></Run>
+                                        <Run Text="/ sec"></Run>
+                                    </TextBlock>
+                                    <TextBlock FontWeight="SemiBold" Text="Diagnostics Frame Rate:" />
+                                    <TextBlock>
+                                        <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DiagnosticsFrameProvider.FrameRate,Mode=OneWay,IsAsync=True}"></Run>
+                                        <Run Text="/ sec"></Run>
                                     </TextBlock>
                                     <TextBlock FontWeight="SemiBold" Text="Enable Diagnostics:" />
                                     <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
@@ -103,7 +108,12 @@
                                     <TextBlock FontWeight="SemiBold" Text="Transfer Rate:" />
                                     <TextBlock>
                                         <Run Text="{Binding Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
-                                        <Run Text="/ second"></Run>
+                                        <Run Text="/ sec"></Run>
+                                    </TextBlock>
+                                    <TextBlock FontWeight="SemiBold" Text="Diagnostics Frame Rate:" />
+                                    <TextBlock>
+                                        <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DiagnosticsFrameProvider.FrameRate,Mode=OneWay,IsAsync=True}"></Run>
+                                        <Run Text="/ sec"></Run>
                                     </TextBlock>
                                     <TextBlock FontWeight="SemiBold" Text="Enable Diagnostics:" />
                                     <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
index 91fc11a22..2a63ae00f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
@@ -16,7 +16,7 @@
                 </StackPanel>
                 <TextBlock HorizontalAlignment="Right" FontSize="18" Margin="0 0 -50 0" Foreground="{StaticResource AccentColorBrush}">Twine Solutions</TextBlock>
                 <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" IsActive="{Binding IsLoading}"></mahapps:ProgressRing>
-                <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic">Loading, please wait...</TextBlock>
+                <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic" Text="{Binding Status,TargetNullValue='Loading, please wait...'}"></TextBlock>
             </StackPanel>
         </Grid>
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 6f0a74805..3a8baf7e5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -5,7 +5,7 @@
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:integration="clr-namespace:Tango.Integration.Services;assembly=Tango.Integration"
+             xmlns:integration="clr-namespace:Tango.Integration.ExternalBridge;assembly=Tango.Integration"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
index 37cd0b793..2a6228eda 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -6,7 +6,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
-             xmlns:integration="clr-namespace:Tango.Integration.Services;assembly=Tango.Integration"
+             xmlns:integration="clr-namespace:Tango.Integration.ExternalBridge;assembly=Tango.Integration"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
              xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS"
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
index 4fb457f87..3b5affbbf 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
@@ -6,7 +6,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
-             xmlns:integration="clr-namespace:Tango.Integration.Services;assembly=Tango.Integration"
+             xmlns:integration="clr-namespace:Tango.Integration.ExternalBridge;assembly=Tango.Integration"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
              xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS"