Disable new session fields and prevent switching tab when OpenCommand…

…Async.IsRunning; Fix #6;
BobLd · Nov 21, 2021 · 9727f46 · 9727f46
1 parent 58e8610
commit 9727f46
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 20 deletions.
diff --git a/Panoptes.Model/Sessions/File/FileSession.cs b/Panoptes.Model/Sessions/File/FileSession.cs
@@ -170,7 +170,7 @@ public void Unsubscribe()
 
         public void Dispose()
         {
-            _watcher.Dispose();
+            _watcher?.Dispose();
         }
 
         public SessionState State

diff --git a/Panoptes.ViewModels/NewSession/NewFileSessionViewModel.cs b/Panoptes.ViewModels/NewSession/NewFileSessionViewModel.cs
@@ -4,6 +4,7 @@
 using Panoptes.Model.Sessions.File;
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -51,6 +52,11 @@ private async Task OpenAsync(CancellationToken cancellationToken)
                 Error = null;
                 await _sessionService.OpenAsync(_fileSessionParameters, cancellationToken).ConfigureAwait(false);
             }
+            catch (OperationCanceledException ocEx)
+            {
+                Debug.WriteLine($"NewFileSessionViewModel.OpenAsync: Operation was canceled.\n{ocEx}");
+                //Error = ocEx.ToString();
+            }
             catch (Exception ex)
             {
                 Error = ex.ToString();

diff --git a/Panoptes.ViewModels/NewSession/NewMongoSessionViewModel.cs b/Panoptes.ViewModels/NewSession/NewMongoSessionViewModel.cs
@@ -4,6 +4,7 @@
 using Panoptes.Model.Sessions;
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Security;
 using System.Threading;
@@ -66,7 +67,8 @@ private async Task OpenAsync(CancellationToken cancellationToken)
                 }
                 catch (OperationCanceledException ocEx)
                 {
-                    Error = ocEx.ToString();
+                    Debug.WriteLine($"NewMongoSessionViewModel.OpenAsync: Operation was canceled.\n{ocEx}");
+                    //Error = ocEx.ToString();
                 }
                 catch (TimeoutException toEx)
                 {

diff --git a/Panoptes.ViewModels/NewSession/NewSessionWindowViewModel.cs b/Panoptes.ViewModels/NewSession/NewSessionWindowViewModel.cs
@@ -1,6 +1,7 @@
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace Panoptes.ViewModels.NewSession
 {
@@ -25,7 +26,11 @@ public ObservableCollection<INewSessionViewModel> NewSessionViewModels
 
         public INewSessionViewModel SelectedViewModel
         {
-            get { return _selectedViewModel; }
+            get
+            {
+                return _selectedViewModel;
+            }
+
             set
             {
                 _selectedViewModel = value;
@@ -35,7 +40,29 @@ public INewSessionViewModel SelectedViewModel
 
         public NewSessionWindowViewModel(IEnumerable<INewSessionViewModel> newSessionViewModels)
         {
+            foreach (var session in newSessionViewModels)
+            {
+                session.OpenCommandAsync.PropertyChanged += OpenCommandAsync_PropertyChanged;
+            }
             NewSessionViewModels = new ObservableCollection<INewSessionViewModel>(newSessionViewModels);
         }
+
+        private void OpenCommandAsync_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            IsAnyRunning = NewSessionViewModels.Any(ns => ns.OpenCommandAsync.IsRunning);
+        }
+
+        private bool _isAnyRunning;
+        public bool IsAnyRunning
+        {
+            get { return _isAnyRunning; }
+
+            set
+            {
+                if (_isAnyRunning == value) return;
+                _isAnyRunning = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }
diff --git a/Panoptes.ViewModels/NewSession/NewStreamSessionViewModel.cs b/Panoptes.ViewModels/NewSession/NewStreamSessionViewModel.cs
@@ -2,7 +2,9 @@
 using Microsoft.Toolkit.Mvvm.Input;
 using Panoptes.Model.Sessions;
 using Panoptes.Model.Sessions.Stream;
+using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -28,17 +30,33 @@ public NewStreamSessionViewModel(ISessionService sessionService)
             });
         }
 
-        private Task OpenAsync(CancellationToken cancellationToken)
+        private async Task OpenAsync(CancellationToken cancellationToken)
         {
-            return Task.Run(() =>
+            try
             {
-                _sessionService.OpenAsync(new StreamSessionParameters
+                await _sessionService.OpenAsync(new StreamSessionParameters
                 {
                     CloseAfterCompleted = true,
                     Host = Host,
                     Port = int.Parse(Port)
-                }, cancellationToken);
-            }, cancellationToken);
+                }, cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException ocEx)
+            {
+                Debug.WriteLine($"NewStreamSessionViewModel.OpenAsync: Operation was canceled.\n{ocEx}");
+                //Error = ocEx.ToString();
+            }
+            catch (Exception ex)
+            {
+                if (ex.InnerException != null)
+                {
+                    Error = ex.InnerException.ToString();
+                }
+                else
+                {
+                    Error = ex.ToString();
+                }
+            }
         }
 
         private bool CanOpen()
@@ -102,6 +120,17 @@ public string Port
             }
         }
 
-        public string Error { get; }
+        private string _error;
+        public string Error
+        {
+            get { return _error; }
+
+            set
+            {
+                if (_error == value) return;
+                _error = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }
diff --git a/Panoptes.ViewModels/Panels/CashBookPanelViewModel.cs b/Panoptes.ViewModels/Panels/CashBookPanelViewModel.cs
@@ -306,6 +306,7 @@ private void Clear()
         {
             try
             {
+                Debug.WriteLine("CashBookPanelViewModel: Clear");
                 _cashesDic.Clear();
                 _resultBgWorker.ReportProgress((int)ActionsThreadUI.Clear);
             }

diff --git a/Panoptes.ViewModels/Panels/HoldingsPanelViewModel.cs b/Panoptes.ViewModels/Panels/HoldingsPanelViewModel.cs
@@ -269,6 +269,7 @@ private void Clear()
         {
             try
             {
+                Debug.WriteLine("HoldingsPanelViewModel: Clear");
                 _holdingsDic.Clear();
                  // _resultsQueue ??
                 _resultBgWorker.ReportProgress((int)ActionsThreadUI.Clear);

diff --git a/Panoptes.ViewModels/Panels/LogPanelViewModel.cs b/Panoptes.ViewModels/Panels/LogPanelViewModel.cs
@@ -76,6 +76,7 @@ private void Clear()
         {
             try
             {
+                Debug.WriteLine("LogPanelViewModel: Clear");
                 _resultBgWorker.ReportProgress((int)ActionsThreadUI.Clear);
             }
             catch (Exception ex)

diff --git a/Panoptes.ViewModels/Panels/ProfitLossPanelViewModel.cs b/Panoptes.ViewModels/Panels/ProfitLossPanelViewModel.cs
@@ -85,6 +85,7 @@ private void Clear()
         {
             try
             {
+                Debug.WriteLine("ProfitLossPanelViewModel: Clear");
                 _pnlBgWorker.ReportProgress((int)ActionsThreadUI.Clear);
             }
             catch (Exception ex)

diff --git a/Panoptes.ViewModels/Panels/RuntimeStatisticsPanelViewModel.cs b/Panoptes.ViewModels/Panels/RuntimeStatisticsPanelViewModel.cs
@@ -99,6 +99,7 @@ private void Clear()
         {
             try
             {
+                Debug.WriteLine("RuntimeStatisticsPanelViewModel: Clear");
                 // _resultsQueue ??
                 _statisticsBgWorker.ReportProgress((int)ActionsThreadUI.Clear);
             }

diff --git a/Panoptes.ViewModels/Panels/StatisticsPanelViewModel.cs b/Panoptes.ViewModels/Panels/StatisticsPanelViewModel.cs
@@ -38,6 +38,7 @@ private void Clear()
         {
             try
             {
+                Debug.WriteLine("StatisticsPanelViewModel: Clear");
                 // _resultsQueue ??
                 Statistics.Clear(); // Need to do that from UI thread
             }
@@ -50,6 +51,7 @@ private void Clear()
 
         private void ParseResult(Result result)
         {
+            if (result.Statistics == null || result.Statistics.Count == 0) return;
             Statistics = new ObservableCollection<StatisticViewModel>(result.Statistics.Select(s => new StatisticViewModel
             {
                 Name = s.Key,

diff --git a/Panoptes/App.axaml b/Panoptes/App.axaml
@@ -58,6 +58,7 @@
 			<converters:StatusBarColorConverter x:Key="StatusBarColorConverter"/>
 			<converters:LogPanelLogoTypeConverter x:Key="LogPanelLogoTypeConverter"/>
 			<converters:PositiveNegativeNumberConverter x:Key="PositiveNegativeNumberConverter"/>
+			<converters:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
 		</ResourceDictionary>
 	</Application.Resources>
 </Application>
diff --git a/Panoptes/Views/Converters/InverseBooleanConverter.cs b/Panoptes/Views/Converters/InverseBooleanConverter.cs
@@ -0,0 +1,24 @@
+using Avalonia.Data.Converters;
+using System;
+
+namespace Panoptes.Views.Converters
+{
+    // https://stackoverflow.com/questions/1039636/how-to-bind-inverse-boolean-properties-in-wpf
+    internal sealed class InverseBooleanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter,
+            System.Globalization.CultureInfo culture)
+        {
+            if (targetType != typeof(bool))
+                throw new InvalidOperationException("The target must be a boolean");
+
+            return !(bool)value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter,
+            System.Globalization.CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/Panoptes/Views/NewSession/NewFileSessionControl.axaml b/Panoptes/Views/NewSession/NewFileSessionControl.axaml
@@ -20,10 +20,13 @@
 		</Grid.RowDefinitions>
 
 		<Label Grid.Row="0">File</Label>
-		<TextBox Name="_textBoxFileName" Margin="0,0,0,4" Grid.Row="0" Grid.Column="1" Text="{Binding FileName}"/>
-		<Button Grid.Row="0" Grid.Column="3" Content="Find" Margin="2,0,0,4" Name="_buttonOpenFile"/>
+		<TextBox Name="_textBoxFileName" Margin="0,0,0,4" Grid.Row="0" Grid.Column="1" Text="{Binding FileName}"
+				 IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
+		<Button Grid.Row="0" Grid.Column="3" Content="Find" Margin="2,0,0,4" Name="_buttonOpenFile"
+				IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 
-		<CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding FileWatch}" Content="Monitor for changes"/>
+		<CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding FileWatch}" Content="Monitor for changes"
+				  IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 		<ProgressBar Grid.Row="3" Grid.ColumnSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
 					 IsIndeterminate="{Binding OpenCommandAsync.IsRunning}" IsVisible="{Binding OpenCommandAsync.IsRunning}"/>
 

diff --git a/Panoptes/Views/NewSession/NewMongoSessionControl.axaml b/Panoptes/Views/NewSession/NewMongoSessionControl.axaml
@@ -29,16 +29,20 @@
 		</Grid.RowDefinitions>
 
 		<Label Grid.Row="0">Host</Label>
-		<TextBox Margin="0,0,0,4" Grid.Row="0" Grid.Column="1" Text="{Binding Host}"/>
+		<TextBox Margin="0,0,0,4" Grid.Row="0" Grid.Column="1" Text="{Binding Host}"
+				 IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 
 		<Label Grid.Row="1" Grid.Column="0">Port</Label>
-		<TextBox Margin="0,0,0,4" Grid.Row="1" Grid.Column="1" Text="{Binding Port}"/>
+		<TextBox Margin="0,0,0,4" Grid.Row="1" Grid.Column="1" Text="{Binding Port}"
+				 IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 
 		<Label Grid.Row="2" Grid.Column="0">User Name</Label>
-		<TextBox Margin="0,0,0,4" Grid.Row="2" Grid.Column="1" Text="{Binding UserName}"/>
+		<TextBox Margin="0,0,0,4" Grid.Row="2" Grid.Column="1" Text="{Binding UserName}"
+				 IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 
 		<Label Grid.Row="3" Grid.Column="0">Password</Label>
-		<TextBox Margin="0,0,0,4" Grid.Row="3" Grid.Column="1" PasswordChar="*" Text="{Binding Password}"/>
+		<TextBox Margin="0,0,0,4" Grid.Row="3" Grid.Column="1" PasswordChar="*" Text="{Binding Password}"
+				 IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 
 		<ProgressBar Grid.Row="5" Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
 					 IsIndeterminate="{Binding OpenCommandAsync.IsRunning}" IsVisible="{Binding OpenCommandAsync.IsRunning}"/>

diff --git a/Panoptes/Views/NewSession/NewSessionWindow.axaml b/Panoptes/Views/NewSession/NewSessionWindow.axaml
@@ -41,7 +41,8 @@
 			<RowDefinition Height="36"></RowDefinition>
 		</Grid.RowDefinitions>
 
-		<TabControl Margin="5" Items="{Binding NewSessionViewModels}" SelectedItem="{Binding SelectedViewModel}">
+		<TabControl Margin="5" Items="{Binding NewSessionViewModels}" SelectedItem="{Binding SelectedViewModel}"
+					IsEnabled="{Binding IsAnyRunning, Converter={StaticResource InverseBooleanConverter}}">
 			<TabControl.ItemTemplate>
 				<DataTemplate>
 					<TextBlock Text="{Binding Header}"/>

diff --git a/Panoptes/Views/NewSession/NewStreamSessionControl.axaml b/Panoptes/Views/NewSession/NewStreamSessionControl.axaml
@@ -28,13 +28,16 @@
 		</Grid.RowDefinitions>
 
 		<Label Grid.Row="0">Host</Label>
-		<TextBox Margin="0,0,0,4" Grid.Row="0" Grid.Column="1" Text="{Binding Host}"/>
+		<TextBox Margin="0,0,0,4" Grid.Row="0" Grid.Column="1" Text="{Binding Host}"
+				 IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 
 		<Label Grid.Row="1" Grid.Column="0">Port</Label>
-		<TextBox Margin="0,0,0,4" Grid.Row="1" Grid.Column="1" Text="{Binding Port}"/>
+		<TextBox Margin="0,0,0,4" Grid.Row="1" Grid.Column="1" Text="{Binding Port}"
+				 IsEnabled="{Binding OpenCommandAsync.IsRunning, Converter={StaticResource InverseBooleanConverter}}"/>
 
 		<Label Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2">
-			<TextBlock TextWrapping="Wrap">NOT RECOMMENDED - Configure LEAN to use the 'StreamingMessageHandler' implementation. You can start this program to connect automatically to localhost by passing the port as a commandline parameter.</TextBlock>
+			<TextBlock TextWrapping="Wrap">NOT RECOMMENDED - Will block the Lean engine and this app will become the bottleneck.
+Configure LEAN to use the 'StreamingMessageHandler' implementation. You can start this program to connect automatically to localhost by passing the port as a commandline parameter.</TextBlock>
 		</Label>
 	</Grid>
 </UserControl>