aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-10-10 16:55:44 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-10-10 16:55:44 +0300
commit79eb19cbd10785a7dbc972bc0b26817932237419 (patch)
treee36176fc94ce6f26efc89b006d7e6faf7e4398cb /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules
parentdf9197240ba5a643ce1599f36b7e3dd34aad6a60 (diff)
downloadTango-79eb19cbd10785a7dbc972bc0b26817932237419.tar.gz
Tango-79eb19cbd10785a7dbc972bc0b26817932237419.zip
Sign-out works !
Fixed issue where color conversion was busy while not in research module but research module in job view. Added new RealTimeGraphX !
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
index 13c3d6779..0def3c943 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
@@ -32,8 +32,8 @@ namespace Tango.MachineStudio.UI.Modules
public DefaultStudioModuleLoader(IAuthenticationProvider authenticationProvider)
{
_authenticationProvider = authenticationProvider;
- AllModules = new ObservableCollection<IStudioModule>();
- UserModules = new ObservableCollection<IStudioModule>();
+ AllModules = new SynchronizedObservableCollection<IStudioModule>();
+ UserModules = new SynchronizedObservableCollection<IStudioModule>();
_authenticationProvider.CurrentUserChanged += _authenticationProvider_CurrentUserChanged;
}
@@ -47,21 +47,21 @@ namespace Tango.MachineStudio.UI.Modules
LoadModules();
}
- private ObservableCollection<IStudioModule> _allModules;
+ private SynchronizedObservableCollection<IStudioModule> _allModules;
/// <summary>
/// Gets all loaded modules.
/// </summary>
- public ObservableCollection<IStudioModule> AllModules
+ public SynchronizedObservableCollection<IStudioModule> AllModules
{
get { return _allModules; }
private set { _allModules = value; RaisePropertyChangedAuto(); }
}
- private ObservableCollection<IStudioModule> _userModules;
+ private SynchronizedObservableCollection<IStudioModule> _userModules;
/// <summary>
/// Gets all the user permitted modules.
/// </summary>
- public ObservableCollection<IStudioModule> UserModules
+ public SynchronizedObservableCollection<IStudioModule> UserModules
{
get { return _userModules; }
private set { _userModules = value; RaisePropertyChangedAuto(); }
@@ -121,13 +121,13 @@ namespace Tango.MachineStudio.UI.Modules
_loaded = true;
}
- AllModules = AllModules.OrderBy(x => x.GetType().GetCustomAttribute<StudioModuleAttribute>().Index).ToObservableCollection();
+ AllModules = AllModules.OrderBy(x => x.GetType().GetCustomAttribute<StudioModuleAttribute>().Index).ToSynchronizedObservableCollection();
UserModules.Clear();
if (_authenticationProvider.CurrentUser != null)
{
- UserModules = AllModules.Where(x => _authenticationProvider.CurrentUser.HasPermission(x.Permission)).ToObservableCollection();
+ UserModules = AllModules.Where(x => _authenticationProvider.CurrentUser.HasPermission(x.Permission)).ToSynchronizedObservableCollection();
}
ModulesLoaded?.Invoke(this, new EventArgs());