aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-04-17 11:53:29 +0300
committerAvi Levkovich <avi@twine-s.com>2018-04-17 11:53:29 +0300
commitbfbfc3f93276421a56300f89c4906bc992a0798e (patch)
tree9c5cf287c52a52d987004f9b19456ddce0f04816 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
parent9477ac8fff7aa1b2043a2713ea01eafde15a4458 (diff)
parenta5ec5d754dd516dfadbb34fe1b167eff817ded6e (diff)
downloadTango-bfbfc3f93276421a56300f89c4906bc992a0798e.tar.gz
Tango-bfbfc3f93276421a56300f89c4906bc992a0798e.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
index 0b1af937f..b3c16c2b4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
@@ -20,6 +20,7 @@ namespace Tango.MachineStudio.Logging
ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
SimpleIoc.Default.Register<EventsViewVM>();
SimpleIoc.Default.Register<ApplicationLogsViewVM>();
+ SimpleIoc.Default.Register<EmbeddedLogsViewVM>();
SimpleIoc.Default.Register<HomeViewVM>();
SimpleIoc.Default.Unregister<LoggingNavigationManager>();
@@ -42,6 +43,14 @@ namespace Tango.MachineStudio.Logging
}
}
+ public static EmbeddedLogsViewVM EmbeddedLogsViewVM
+ {
+ get
+ {
+ return ServiceLocator.Current.GetInstance<EmbeddedLogsViewVM>();
+ }
+ }
+
public static HomeViewVM HomeViewVM
{
get