Machine Studio v4.0.10

PPC v1.0.9

11 files changed, 38 insertions, 30 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
index ace1d38af..47a3df569 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
@@ -279,8 +279,8 @@
                     </touch:LightTouchDataGrid>
                 </touch:TouchLoadingPanel>
 
-                <touch:TouchLoadingPanel IsLoading="{Binding IsLoadingJobs}">
-                    <touch:LightTouchDataGrid AnimateSorting="False" RenderOptions.EdgeMode="Unspecified" x:Name="dataGridJobsHistory" Visibility="{Binding SelectedCategory,Converter={StaticResource JobsCategoryToVisibilityConverter},ConverterParameter='History'}" Style="{StaticResource TangoJobsGrid}" SelectedItems="{Binding SelectedJobs}" IsMultiSelecting="{Binding IsMultiSelecting,Mode=TwoWay}" ItemsSource="{Binding HistoryJobsCollectionView}" ItemSelectedCommand="{Binding JobSelectedCommand}" Margin="10">
+                <touch:TouchLoadingPanel IsLoading="{Binding IsLoadingJobs}" Visibility="{Binding SelectedCategory,Converter={StaticResource JobsCategoryToVisibilityConverter},ConverterParameter='History'}">
+                    <touch:LightTouchDataGrid AnimateSorting="False" EnableDragAndDrop="False" RenderOptions.EdgeMode="Unspecified" x:Name="dataGridJobsHistory" Style="{StaticResource TangoJobsGrid}" SelectedItems="{Binding SelectedJobs}" IsMultiSelecting="{Binding IsMultiSelecting,Mode=TwoWay}" ItemsSource="{Binding HistoryJobsCollectionView}" ItemSelectedCommand="{Binding JobSelectedCommand}" Margin="10">
                         <touch:LightTouchDataGrid.Columns>
                             <touch:LightTouchDataGridColumn Width="50">
                                 <touch:LightTouchDataGridColumn.Header>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connectivity/AvailableWiFiConnectionsControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connectivity/AvailableWiFiConnectionsControl.xaml
index 80581551e..dac37ba10 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connectivity/AvailableWiFiConnectionsControl.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connectivity/AvailableWiFiConnectionsControl.xaml
@@ -64,8 +64,8 @@
                             <Grid Margin="20" Visibility="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <Grid Height="80">
                                     <touch:TouchCheckBox VerticalAlignment="Top" Margin="60 0 0 0" IsChecked="{Binding AutoConnect}" Visibility="{Binding IsConnected,Converter={StaticResource BooleanToVisibilityInverseConverter}}">Connect automatically</touch:TouchCheckBox>
-                                    <touch:TouchButton Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ConnectToWiFiCommand}" CommandParameter="{Binding}" Width="150" CornerRadius="17" Height="40" HorizontalAlignment="Right" VerticalAlignment="Bottom" Visibility="{Binding IsConnected,Converter={StaticResource BooleanToVisibilityInverseConverter}}">Connect</touch:TouchButton>
-                                    <touch:TouchButton Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DisconnectFromWiFiCommand}" CommandParameter="{Binding}" Width="150" CornerRadius="17" Height="40" HorizontalAlignment="Right" VerticalAlignment="Bottom" Visibility="{Binding IsConnected,Converter={StaticResource BooleanToVisibilityConverter}}">Disconnect</touch:TouchButton>
+                                    <touch:TouchButton EnableDropShadow="False" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ConnectToWiFiCommand}" CommandParameter="{Binding}" Width="150" CornerRadius="17" Height="40" HorizontalAlignment="Right" VerticalAlignment="Bottom" Visibility="{Binding IsConnected,Converter={StaticResource BooleanToVisibilityInverseConverter}}">Connect</touch:TouchButton>
+                                    <touch:TouchButton EnableDropShadow="False" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DisconnectFromWiFiCommand}" CommandParameter="{Binding}" Width="150" CornerRadius="17" Height="40" HorizontalAlignment="Right" VerticalAlignment="Bottom" Visibility="{Binding IsConnected,Converter={StaticResource BooleanToVisibilityConverter}}">Disconnect</touch:TouchButton>
                                 </Grid>
 
                                 <Grid Visibility="{Binding Connecting,Converter={StaticResource BooleanToVisibilityConverter}}" Background="{StaticResource TangoMidBackgroundBrush}">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/HotSpot/DefaultHotSpotProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/HotSpot/DefaultHotSpotProvider.cs
index 4f035d814..835a7fc4a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/HotSpot/DefaultHotSpotProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/HotSpot/DefaultHotSpotProvider.cs
@@ -77,7 +77,7 @@ namespace Tango.PPC.Common.HotSpot
             {
                 try
                 {
-                    CmdCommand command = new CmdCommand("netsh", $"wlan set hostednetwork mode=allow ssid='{"Tango-" + _machineProvider.Machine.SerialNumber}' key='{password}'");
+                    CmdCommand command = new CmdCommand("netsh", $"wlan set hostednetwork mode=allow ssid={"Tango-" + _machineProvider.Machine.SerialNumber} key={password}");
                     await command.Run();
 
                     command = new CmdCommand("netsh", "wlan start hosted network");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index 3fffc2045..b64b624fe 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -75,13 +75,10 @@ namespace Tango.PPC.Common.MachineUpdate
 
         private Task Login(String serialNumber)
         {
-            return Task.Factory.StartNew(() =>
+            return _client.Login(new LoginRequest()
             {
-                return _client.Login(new LoginRequest()
-                {
-                    Mode = LoginMode.Machine,
-                    SerialNumber = serialNumber,
-                }).Result;
+                Mode = LoginMode.Machine,
+                SerialNumber = serialNumber,
             });
         }
 
@@ -310,7 +307,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).Wait();
+                Login(serialNumber).GetAwaiter().GetResult();
 
                 LogManager.Log($"Checking if updates available...");
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Printing/IPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Printing/IPrintingManager.cs
index 37a71c965..dc097a805 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Printing/IPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Printing/IPrintingManager.cs
@@ -22,7 +22,7 @@ namespace Tango.PPC.Common.Printing
         /// <param name="job">The job.</param>
         /// <param name="context">The context.</param>
         /// <returns></returns>
-        JobHandler Print(Job job, ObservablesContext context);
+        Task<JobHandler> Print(Job job, ObservablesContext context);
 
         /// <summary>
         /// Creates a sample dye job from the specified job and prints it.
@@ -31,7 +31,7 @@ namespace Tango.PPC.Common.Printing
         /// <param name="job">The job.</param>
         /// <param name="context">The context.</param>
         /// <returns></returns>
-        JobHandler PrintSample(Job job, ObservablesContext context);
+        Task<JobHandler> PrintSample(Job job, ObservablesContext context);
 
         /// <summary>
         /// Creates a fine tuning job from the specified job and fine tune items.
@@ -41,6 +41,6 @@ namespace Tango.PPC.Common.Printing
         /// <param name="context">The context.</param>
         /// <param name="fineTuneItems">The fine tune items.</param>
         /// <returns></returns>
-        JobHandler PrintFineTuning(Job job, ObservablesContext context, IEnumerable<FineTuneItem> fineTuneItems);
+        Task<JobHandler> PrintFineTuning(Job job, ObservablesContext context, IEnumerable<FineTuneItem> fineTuneItems);
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index d6770ed45..f05c05a44 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -42,13 +42,13 @@ namespace Tango.PPC.UI.Printing
         /// <param name="job">The job.</param>
         /// <param name="context">The context.</param>
         /// <returns></returns>
-        public JobHandler Print(Job job, ObservablesContext context)
+        public async Task<JobHandler> Print(Job job, ObservablesContext context)
         {
 
 #if STUBPRINT
-                var handler = _machineProvider.MachineOperator.PrintStub(job);
+                var handler = await _machineProvider.MachineOperator.PrintStub(job);
 #else
-                var handler = _machineProvider.MachineOperator.Print(job);
+                var handler = await _machineProvider.MachineOperator.Print(job);
 #endif
 
             handler.Completed += async (x, e) =>
@@ -104,7 +104,7 @@ namespace Tango.PPC.UI.Printing
         /// <param name="job">The job.</param>
         /// <param name="context">The context.</param>
         /// <returns></returns>
-        public JobHandler PrintSample(Job job, ObservablesContext context)
+        public async Task<JobHandler> PrintSample(Job job, ObservablesContext context)
         {
             LogManager.Log("Cloning job...");
             Job sampleDyeJob = job.Clone();
@@ -131,7 +131,7 @@ namespace Tango.PPC.UI.Printing
 
             LogManager.Log("Executing sample dye job...");
 
-            var handler = _machineProvider.MachineOperator.Print(sampleDyeJob);
+            var handler = await _machineProvider.MachineOperator.Print(sampleDyeJob);
             handler.Completed += async (x, e) =>
             {
                 try
@@ -157,7 +157,7 @@ namespace Tango.PPC.UI.Printing
         /// <param name="context">The context.</param>
         /// <param name="fineTuneItems">The fine tune items.</param>
         /// <returns></returns>
-        public JobHandler PrintFineTuning(Job job, ObservablesContext context, IEnumerable<FineTuneItem> fineTuneItems)
+        public async Task<JobHandler> PrintFineTuning(Job job, ObservablesContext context, IEnumerable<FineTuneItem> fineTuneItems)
         {
             LogManager.Log("Cloning job...");
             Job fineTuneJob = job.Clone();
@@ -172,7 +172,7 @@ namespace Tango.PPC.UI.Printing
                 var segment = fineTuneJob.AddSolidSegment(suggestion.Color);
             }
 
-            var handler = _machineProvider.MachineOperator.Print(fineTuneJob);
+            var handler = await _machineProvider.MachineOperator.Print(fineTuneJob);
             handler.Completed += async (x, e) =>
             {
                 try
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index fa54f491e..a0db99ffb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyVersion("1.0.9.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
index 83f629159..80a95d1bf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
@@ -116,12 +116,15 @@ namespace Tango.PPC.UI.ViewModels
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         private void ExternalBridgeService_ClientDisconnected(object sender, EventArgs e)
         {
-            LogManager.Log("External bridge client disconnected. Navigating to home module...");
-
-            InvokeUI(() =>
+            if (IsVisible)
             {
-                NavigationManager.NavigateTo(NavigationView.HomeModule);
-            });
+                LogManager.Log("External bridge client disconnected. Navigating to home module...");
+
+                InvokeUI(() =>
+                {
+                    NavigationManager.NavigateTo(NavigationView.HomeModule);
+                });
+            }
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index 07da99818..f265c5dbf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -140,6 +140,14 @@ namespace Tango.PPC.UI.ViewModels
                 _isChecking = true;
                 IsDbUpdate = false;
 
+                await Task.Delay(2000);
+                if (!await ConnectivityProvider.CheckInternetConnection())
+                {
+                    _isChecking = false;
+                    await NavigateTo(MachineUpdateView.UpdateCheckErrorView);
+                    return;
+                }
+
                 var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber);
 
                 if (response.IsUpdateAvailable)
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
index ba7e9e019..fba8a599d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
@@ -174,7 +174,7 @@
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 50 0 0">
                             <touch:TouchIcon Icon="AlertOutline" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
                             <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0"  FontSize="{StaticResource TangoTitleFontSize}">Update Failed</TextBlock>
-                            <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" Foreground="{StaticResource TangoErrorBrush}" Text="{Binding FailedError,FallbackValue='Unexpected error'}"></TextBlock>
+                            <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" Foreground="{StaticResource TangoErrorBrush}" TextAlignment="Center" Text="{Binding FailedError,FallbackValue='Unexpected error'}"></TextBlock>
                         </StackPanel>
                     </DockPanel>
                 </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
index e4c107049..c63ef1e13 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
@@ -59,7 +59,7 @@
                             </touch:TouchIcon.Style>
                         </touch:TouchIcon>
 
-                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="AccessPointNetwork" Visibility="{Binding ConnectivityProvider.IsHotspotActive,Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="AccessPointNetwork" Visibility="{Binding HotSpotProvider.IsEnabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                         <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}" />