Working on machine setup !

1 files changed, 14 insertions, 7 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
index b9114dba4..b2475b139 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
@@ -173,10 +173,22 @@ namespace Tango.PPC.Common
     /// <seealso cref="Tango.SharedUI.ViewModel" />
     public abstract class PPCViewModel<T> : PPCViewModel where T : IPPCView
     {
+        private T _view;
         /// <summary>
         /// Gets the IPPCView instance.
         /// </summary>
-        public T View { get; private set; }
+        [TangoInject(TangoInjectMode.WhenAvailable)]
+        public T View
+        {
+            get { return _view; }
+            set
+            {
+                _view = value;
+                ViewAttached = true;
+                OnViewAttached();
+            }
+        }
+
 
         /// <summary>
         /// Gets a value indicating whether the instance of IPPCView is available.
@@ -188,12 +200,7 @@ namespace Tango.PPC.Common
         /// </summary>
         public override void OnApplicationStarted()
         {
-            TangoIOC.Default.GetInstanceWhenAvailable<T>((view) =>
-            {
-                ViewAttached = true;
-                View = view;
-                OnViewAttached();
-            });
+
         }
 
         /// <summary>