aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-04-25 09:44:13 +0300
committerAvi Levkovich <avi@twine-s.com>2018-04-25 09:44:13 +0300
commitd352d3b3bd785d9eb8a93347333de0b357f7ce0e (patch)
tree2488173ea7e4f9d5ddb6ef53de57998815732847 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs
parentc82908b6d5314bc2602ea10c373267b79fbdd810 (diff)
parenta89077bae848d010ae70da6be572dee3b824a895 (diff)
downloadTango-d352d3b3bd785d9eb8a93347333de0b357f7ce0e.tar.gz
Tango-d352d3b3bd785d9eb8a93347333de0b357f7ce0e.zip
Start SPI ADS1220
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs
index 66018e09c..f1f4d9d89 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModelLocator.cs
@@ -1,6 +1,4 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Practices.ServiceLocation;
+using Tango.Core.DI;
using Tango.MachineStudio.MachineDesigner.ViewModels;
namespace Tango.MachineStudio.MachineDesigner
@@ -16,15 +14,14 @@ namespace Tango.MachineStudio.MachineDesigner
/// </summary>
static ViewModelLocator()
{
- ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
- SimpleIoc.Default.Register<MainViewVM>();
+ TangoIOC.Default.Register<MainViewVM>();
}
public static MainViewVM MainViewVM
{
get
{
- return ServiceLocator.Current.GetInstance<MainViewVM>();
+ return TangoIOC.Default.GetInstance<MainViewVM>();
}
}
}