Implemented "Dialogs" on TouchPanel and PPC INotificationProvider !

Added Inject method to TangoIOC.
Started working on color correction.

2 files changed, 26 insertions, 9 deletions

diff --git a/Software/Visual_Studio/Tango.Core/DI/ITangoIOC.cs b/Software/Visual_Studio/Tango.Core/DI/ITangoIOC.cs
index 145e9988a..1e847e47a 100644
--- a/Software/Visual_Studio/Tango.Core/DI/ITangoIOC.cs
+++ b/Software/Visual_Studio/Tango.Core/DI/ITangoIOC.cs
@@ -97,6 +97,12 @@ namespace Tango.Core.DI
         T GetInstance<T>();
 
         /// <summary>
+        /// Injects any dependencies to the target properties using the <see cref="TangoInjectAttribute"/>.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        void Inject(Object target);
+
+        /// <summary>
         /// Executes the specified action when type T is available. if already available action will be executed immediately.
         /// </summary>
         /// <typeparam name="T"></typeparam>
diff --git a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
index c10c550cb..20827bca7 100644
--- a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
+++ b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
@@ -306,15 +306,7 @@ namespace Tango.Core.DI
                 instance = Activator.CreateInstance(type);
             }
 
-            foreach (var prop in type.GetPropertiesWithAttribute<TangoInjectAttribute>(BindingFlags.Public | BindingFlags.Instance))
-            {
-                prop.SetValue(instance, GetInstance(prop.PropertyType));
-            }
-
-            foreach (var field in type.GetFieldsWithAttribute<TangoInjectAttribute>(BindingFlags.NonPublic | BindingFlags.Instance))
-            {
-                field.SetValue(instance, GetInstance(field.FieldType));
-            }
+            Inject(instance);
 
             return instance;
         }
@@ -338,5 +330,24 @@ namespace Tango.Core.DI
         {
             return _registeredTypes.Where(x => baseType.IsAssignableFrom(x.Key)).Select(x => x.Value.Instance != null ? x.Value.Instance : CreateInstance(x.Value.ImplementationType));
         }
+
+        /// <summary>
+        /// Injects any dependencies to the target properties using the <see cref="TangoInjectAttribute" />.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        public void Inject(object target)
+        {
+            var type = target.GetType();
+
+            foreach (var prop in type.GetPropertiesWithAttribute<TangoInjectAttribute>(BindingFlags.Public | BindingFlags.Instance))
+            {
+                prop.SetValue(target, GetInstance(prop.PropertyType));
+            }
+
+            foreach (var field in type.GetFieldsWithAttribute<TangoInjectAttribute>(BindingFlags.NonPublic | BindingFlags.Instance))
+            {
+                field.SetValue(target, GetInstance(field.FieldType));
+            }
+        }
     }
 }