Machine Studio v4.0.10

PPC v1.0.6

4 files changed, 239 insertions, 160 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
index 161177bf1..7c56115e3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
@@ -105,109 +105,148 @@ namespace Tango.MachineStudio.UI.Notifications
         }
 
         /// <summary>
-        /// Creates a new instance of the specified View type and displays it as a modal dialog.
+        ///  Shows the specified view with the specified view model as it's data context.
         /// </summary>
+        /// <typeparam name="VM">The type of the mm.</typeparam>
         /// <typeparam name="View">The type of the view.</typeparam>
-        /// <typeparam name="VM">The type of the view model.</typeparam>
-        /// <param name="onAccept">Accept button callback.</param>
-        /// <param name="onCancel">Cancel button callback.</param>
-        public void ShowModalDialog<View, VM>(Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM
+        /// <param name="vm">The view model.</param>
+        /// <param name="view">The view.</param>
+        /// <param name="onAccept">The accept action.</param>
+        /// <param name="onCancel">The cancel action.</param>
+        public void ShowModalDialog<VM, View>(VM vm, View view, Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM
         {
-            var view = Activator.CreateInstance<View>();
-            DialogWindow dialog = new DialogWindow();
-            dialog.Owner = Application.Current.MainWindow;
-            dialog.InnerContent = view;
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
-            view.Loaded += (x, y) =>
+            try
             {
-                VM context = view.DataContext as VM;
-                dialog.DataContext = context;
+                DialogWindow dialog = new DialogWindow();
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.InnerContent = view;
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
+                view.Loaded += (x, y) =>
+                {
+                    try
+                    {
+                        VM context = vm;
+                        dialog.DataContext = context;
 
-                Action onAcceptAction = null;
-                Action onCancelAction = null;
+                        Action onAcceptAction = null;
+                        Action onCancelAction = null;
 
-                onAcceptAction = new Action(() =>
-                {
-                    dialog.Close();
-                    onAccept(context);
-                    context.Accepted -= onAcceptAction;
-                    context.Canceled -= onCancelAction;
-                });
+                        onAcceptAction = new Action(() =>
+                        {
+                            dialog.Close();
+                            onAccept(context);
+                            context.Accepted -= onAcceptAction;
+                            context.Canceled -= onCancelAction;
+                        });
 
-                onCancelAction = new Action(() =>
-                {
-                    dialog.Close();
+                        onCancelAction = new Action(() =>
+                        {
+                            dialog.Close();
 
-                    if (onCancel != null)
-                    {
-                        onCancel();
-                    }
+                            if (onCancel != null)
+                            {
+                                onCancel();
+                            }
 
-                    context.Accepted -= onAcceptAction;
-                    context.Canceled -= onCancelAction;
-                });
+                            context.Canceled -= onCancelAction;
+                            context.Accepted -= onAcceptAction;
+                        });
 
-                context.Accepted += onAcceptAction;
-                context.Canceled += onCancelAction;
+                        context.Accepted += onAcceptAction;
+                        context.Canceled += onCancelAction;
 
-                context.OnShow();
-            };
-            dialog.ShowDialog();
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+                        context.OnShow();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                        onCancel?.Invoke();
+                    }
+                };
+
+                dialog.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                onCancel?.Invoke();
+            }
+            finally
+            {
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+            }
         }
 
         /// <summary>
-        ///  Shows the specified view with the specified view model as it's data context.
+        /// Creates a new instance of the specified View type and displays it as a modal dialog.
         /// </summary>
-        /// <typeparam name="VM">The type of the mm.</typeparam>
         /// <typeparam name="View">The type of the view.</typeparam>
-        /// <param name="vm">The view model.</param>
-        /// <param name="view">The view.</param>
-        /// <param name="onAccept">The accept action.</param>
-        /// <param name="onCancel">The cancel action.</param>
-        public void ShowModalDialog<VM, View>(VM vm, Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM
+        /// <typeparam name="VM">The type of the view model.</typeparam>
+        /// <param name="onAccept">Accept button callback.</param>
+        /// <param name="onCancel">Cancel button callback.</param>
+        public void ShowModalDialog<View, VM>(Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM
         {
-            var view = Activator.CreateInstance<View>();
-            DialogWindow dialog = new DialogWindow();
-            dialog.Owner = Application.Current.MainWindow;
-            dialog.InnerContent = view;
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
-            view.Loaded += (x, y) =>
+            try
             {
-                VM context = vm;
-                dialog.DataContext = context;
+                var view = Activator.CreateInstance<View>();
+                DialogWindow dialog = new DialogWindow();
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.InnerContent = view;
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
+                view.Loaded += (x, y) =>
+                {
+                    try
+                    {
+                        VM context = view.DataContext as VM;
+                        dialog.DataContext = context;
 
-                Action onAcceptAction = null;
-                Action onCancelAction = null;
+                        Action onAcceptAction = null;
+                        Action onCancelAction = null;
 
-                onAcceptAction = new Action(() =>
-                {
-                    dialog.Close();
-                    onAccept(context);
-                    context.Accepted -= onAcceptAction;
-                    context.Canceled -= onCancelAction;
-                });
+                        onAcceptAction = new Action(() =>
+                        {
+                            dialog.Close();
+                            onAccept(context);
+                            context.Accepted -= onAcceptAction;
+                            context.Canceled -= onCancelAction;
+                        });
 
-                onCancelAction = new Action(() =>
-                {
-                    dialog.Close();
+                        onCancelAction = new Action(() =>
+                        {
+                            dialog.Close();
 
-                    if (onCancel != null)
-                    {
-                        onCancel();
-                    }
+                            if (onCancel != null)
+                            {
+                                onCancel();
+                            }
 
-                    context.Accepted -= onAcceptAction;
-                    context.Canceled -= onCancelAction;
-                });
+                            context.Accepted -= onAcceptAction;
+                            context.Canceled -= onCancelAction;
+                        });
 
-                context.Accepted += onAcceptAction;
-                context.Canceled += onCancelAction;
+                        context.Accepted += onAcceptAction;
+                        context.Canceled += onCancelAction;
 
-                context.OnShow();
-            };
-            dialog.ShowDialog();
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+                        context.OnShow();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                        onCancel?.Invoke();
+                    }
+                };
+                dialog.ShowDialog();
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                onCancel?.Invoke();
+            }
+            finally
+            {
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+            }
         }
 
         /// <summary>
@@ -219,48 +258,68 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <param name="view">The view.</param>
         /// <param name="onAccept">The accept action.</param>
         /// <param name="onCancel">The cancel action.</param>
-        public void ShowModalDialog<VM, View>(VM vm, View view, Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM
+        public void ShowModalDialog<VM, View>(VM vm, Action<VM> onAccept, Action onCancel) where View : FrameworkElement where VM : DialogViewVM
         {
-            DialogWindow dialog = new DialogWindow();
-            dialog.Owner = Application.Current.MainWindow;
-            dialog.InnerContent = view;
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
-            view.Loaded += (x, y) =>
+            try
             {
-                VM context = vm;
-                dialog.DataContext = context;
+                var view = Activator.CreateInstance<View>();
+                DialogWindow dialog = new DialogWindow();
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.InnerContent = view;
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
+                view.Loaded += (x, y) =>
+                {
+                    try
+                    {
+                        VM context = vm;
+                        dialog.DataContext = context;
 
-                Action onAcceptAction = null;
-                Action onCancelAction = null;
+                        Action onAcceptAction = null;
+                        Action onCancelAction = null;
 
-                onAcceptAction = new Action(() =>
-                {
-                    dialog.Close();
-                    onAccept(context);
-                    context.Accepted -= onAcceptAction;
-                    context.Canceled -= onCancelAction;
-                });
+                        onAcceptAction = new Action(() =>
+                        {
+                            dialog.Close();
+                            onAccept(context);
+                            context.Accepted -= onAcceptAction;
+                            context.Canceled -= onCancelAction;
+                        });
 
-                onCancelAction = new Action(() =>
-                {
-                    dialog.Close();
+                        onCancelAction = new Action(() =>
+                        {
+                            dialog.Close();
 
-                    if (onCancel != null)
-                    {
-                        onCancel();
-                    }
+                            if (onCancel != null)
+                            {
+                                onCancel();
+                            }
 
-                    context.Canceled -= onCancelAction;
-                    context.Accepted -= onAcceptAction;
-                });
+                            context.Accepted -= onAcceptAction;
+                            context.Canceled -= onCancelAction;
+                        });
 
-                context.Accepted += onAcceptAction;
-                context.Canceled += onCancelAction;
+                        context.Accepted += onAcceptAction;
+                        context.Canceled += onCancelAction;
 
-                context.OnShow();
-            };
-            dialog.ShowDialog();
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+                        context.OnShow();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                        onCancel?.Invoke();
+                    }
+                };
+                dialog.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                onCancel?.Invoke();
+            }
+            finally
+            {
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+            }
         }
 
         /// <summary>
@@ -272,67 +331,87 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <exception cref="NullReferenceException">Could not locate view " + viewName</exception>
         public void ShowModalDialog<VM>(Action<VM> onAccept, Action onCancel) where VM : DialogViewVM
         {
-            String viewName = typeof(VM).Name.Replace("VM", "");
-
-            if (viewTypes == null)
+            try
             {
-                viewTypes = AppDomain.CurrentDomain.GetAssemblies().Where(x => x.FullName.Contains("MachineStudio")).SelectMany(x => x.GetTypes()).ToList();
-            }
+                String viewName = typeof(VM).Name.Replace("VM", "");
 
-            var viewType = viewTypes.SingleOrDefault(x => x.Name == viewName);
+                if (viewTypes == null)
+                {
+                    viewTypes = AppDomain.CurrentDomain.GetAssemblies().Where(x => x.FullName.Contains("MachineStudio")).SelectMany(x => x.GetTypes()).ToList();
+                }
 
-            if (viewType == null)
-            {
-                throw new NullReferenceException("Could not locate view " + viewName);
-            }
+                var viewType = viewTypes.SingleOrDefault(x => x.Name == viewName);
 
-            var view = Activator.CreateInstance(viewType) as FrameworkElement;
-            DialogWindow dialog = new DialogWindow();
-            dialog.Owner = Application.Current.MainWindow;
-            dialog.InnerContent = view;
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
-            view.Loaded += (x, y) =>
-            {
-                VM context = view.DataContext as VM;
-                if (context == null)
+                if (viewType == null)
                 {
-                    context = Activator.CreateInstance<VM>();
+                    throw new NullReferenceException("Could not locate view " + viewName);
                 }
-                dialog.DataContext = context;
-
-                Action onCancelAction = null;
-                Action onAcceptAction = null;
 
-                onAcceptAction = new Action(() =>
+                var view = Activator.CreateInstance(viewType) as FrameworkElement;
+                DialogWindow dialog = new DialogWindow();
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.InnerContent = view;
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
+                view.Loaded += (x, y) =>
                 {
-                    dialog.Close();
-                    onAccept(context);
+                    try
+                    {
+                        VM context = view.DataContext as VM;
+                        if (context == null)
+                        {
+                            context = Activator.CreateInstance<VM>();
+                        }
+                        dialog.DataContext = context;
 
-                    context.Canceled -= onCancelAction;
-                    context.Accepted -= onAcceptAction;
-                });
+                        Action onCancelAction = null;
+                        Action onAcceptAction = null;
 
-                onCancelAction = new Action(() =>
-                {
-                    dialog.Close();
+                        onAcceptAction = new Action(() =>
+                        {
+                            dialog.Close();
+                            onAccept(context);
 
-                    if (onCancel != null)
-                    {
-                        onCancel();
-                    }
+                            context.Canceled -= onCancelAction;
+                            context.Accepted -= onAcceptAction;
+                        });
 
-                    context.Canceled -= onCancelAction;
-                    context.Accepted -= onAcceptAction;
-                });
+                        onCancelAction = new Action(() =>
+                        {
+                            dialog.Close();
 
-                context.Accepted += onAcceptAction;
-                context.Canceled += onCancelAction;
+                            if (onCancel != null)
+                            {
+                                onCancel();
+                            }
 
-                context.OnShow();
-            };
+                            context.Canceled -= onCancelAction;
+                            context.Accepted -= onAcceptAction;
+                        });
 
-            dialog.ShowDialog();
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+                        context.Accepted += onAcceptAction;
+                        context.Canceled += onCancelAction;
+
+                        context.OnShow();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                        onCancel?.Invoke();
+                        return;
+                    }
+                };
+
+                dialog.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error display modal dialog. {typeof(VM).Name}");
+                onCancel?.Invoke();
+            }
+            finally
+            {
+                MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+            }
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml
index c11e2e11b..2eb1080cb 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Tango.MachineStudio.UI.Windows"
         mc:Ignorable="d"
-        Title="Machine Studio" MinHeight="220" SizeToContent="WidthAndHeight" MinWidth="600" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterOwner" Background="Transparent">
+        Title="Machine Studio" MinHeight="220" SizeToContent="WidthAndHeight" MinWidth="600" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterOwner" Background="Transparent" ShowInTaskbar="False">
     <Grid>
         <Grid>
             <Border Background="White" CornerRadius="10" Padding="10" Margin="20">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
index a89f8eeca..8f9512236 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
         mc:Ignorable="d"
-        Title="Machine Studio" MinHeight="220" MaxHeight="600" SizeToContent="Height" Width="570" Opacity="0" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterOwner" Background="Transparent">
+        Title="Machine Studio" MinHeight="220" MaxHeight="600" SizeToContent="Height" Width="570" Opacity="0" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterOwner" Background="Transparent" ShowInTaskbar="False">
 
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></BooleanToVisibilityConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml
index d2aad7cee..5e27071ec 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
         mc:Ignorable="d"
-        Title="Machine Studio" MinHeight="220" MaxHeight="600" SizeToContent="Height" Width="570" Opacity="0" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterOwner" Background="Transparent">
+        Title="Machine Studio" MinHeight="220" MaxHeight="600" SizeToContent="Height" Width="570" Opacity="0" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterOwner" Background="Transparent" ShowInTaskbar="False">
 
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></BooleanToVisibilityConverter>