diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-03-18 17:25:20 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-03-18 17:25:20 +0200 |
| commit | 5caec1e3670f85f548805d3e1d9500d257c04e53 (patch) | |
| tree | 2c82e09a7e70027bd8c9025e4be9043ac4b5853e /Software/Visual_Studio/MachineStudio/Modules | |
| parent | 19a6a9d026f3436afd9af7923db7ee6cbd861772 (diff) | |
| download | Tango-5caec1e3670f85f548805d3e1d9500d257c04e53.tar.gz Tango-5caec1e3670f85f548805d3e1d9500d257c04e53.zip | |
Actions log. - Added IsLoadingDifferences property for waiting loading differences.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
2 files changed, 12 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs index 50ec7f7a5..c091f1221 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs @@ -95,6 +95,14 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels set { _isLoading = value; RaisePropertyChangedAuto(); } } + private bool _isLoadingDifferences; + + public bool IsLoadingDifferences + { + get { return _isLoadingDifferences; } + set { _isLoadingDifferences = value; RaisePropertyChangedAuto(); } + } + @@ -109,6 +117,7 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels _notification = notification; IsLoading = false; + IsLoadingDifferences = false; ActionLogs = new ObservableCollection<ActionLog>(); SearchCommand = new RelayCommand(async () => await GetActionLogs(), () => IsFree); CopyRelateObjectIDCommand = new RelayCommand(CopyRelateObjectID); @@ -257,7 +266,7 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels /// </summary> public async Task InitSelectedActionLogDifference() { - IsLoading = true; + IsLoadingDifferences = true; try { using (var db = ObservablesContext.CreateDefault()) @@ -275,7 +284,7 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels } finally { - IsLoading = false; + IsLoadingDifferences = false; } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml index b077f6088..e2d65d7a3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml @@ -315,7 +315,7 @@ </DockPanel> </Border> - <mahapps:ProgressRing Grid.Row="1" Grid.Column="1" Margin="20 0 20 40" Width="80" Height="80" IsActive="{Binding IsLoading}"></mahapps:ProgressRing> + <mahapps:ProgressRing Grid.Row="1" Grid.Column="1" Margin="20 0 20 40" Width="80" Height="80" IsActive="{Binding IsLoadingDifferences}"></mahapps:ProgressRing> </Grid> </Grid> |