2 files changed, 64 insertions, 6 deletions
diff --git a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
index 322f43a4c..9e9c8094a 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
@@ -25,20 +25,35 @@ namespace Tango.SharedUI.Components
             set { _isEnabled = value; RaisePropertyChangedAuto(); }
         }
 
+        private Object _data;
+        public Object Data
+        {
+            get { return _data; }
+            set { _data = value; RaisePropertyChangedAuto(); }
+        }
+
         public SelectedObject()
         {
             IsEnabled = true;
         }
+
+        public SelectedObject(Object data) : this()
+        {
+            Data = data;
+        }
+
+        public SelectedObject(Object data, bool selected) : this(data)
+        {
+            IsSelected = selected;
+        }
     }
 
     public class SelectedObject<T> : SelectedObject
     {
-        private T _data;
-
-        public T Data
+        new public T Data
         {
-            get { return _data; }
-            set { _data = value; RaisePropertyChangedAuto(); }
+            get { return (T)base.Data; }
+            set { base.Data = (T)value; RaisePropertyChangedAuto(); }
         }
 
         public SelectedObject() : base()
diff --git a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObjectCollection.cs b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObjectCollection.cs
index 8aa087ed3..a174dc070 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObjectCollection.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObjectCollection.cs
@@ -1,14 +1,32 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.SharedUI.Components;
+
+public static class ISelectedObjectCollectionExt
+{
+    public static IList<SelectedObject> GetItems(this ISelectedObjectCollection source)
+    {
+        return source.Cast<SelectedObject>().ToList();
+    }
+}
 
 namespace Tango.SharedUI.Components
 {
-    public class SelectedObjectCollection<T> : ObservableCollection<SelectedObject<T>>
+    public interface ISelectedObjectCollection : IEnumerable, INotifyCollectionChanged
+    {
+        event EventHandler SelectionChanged;
+        ObservableCollection<Object> Source { get; set; }
+        ObservableCollection<Object> SynchedSource { get; set; }
+    }
+
+    public class SelectedObjectCollection<T> : ObservableCollection<SelectedObject<T>>, ISelectedObjectCollection
     {
         private Func<T, T, bool> _compareFunc;
 
@@ -16,6 +34,11 @@ namespace Tango.SharedUI.Components
         public ObservableCollection<T> Source { get; set; }
         public ObservableCollection<T> SynchedSource { get; set; }
 
+        ObservableCollection<object> ISelectedObjectCollection.Source { get; set; }
+        ObservableCollection<object> ISelectedObjectCollection.SynchedSource { get; set; }
+
+        public bool IsReadOnly { get; }
+
         public SelectedObjectCollection(ObservableCollection<T> source, ObservableCollection<T> synchedSource, Func<T, T, bool> compareFunc)
         {
             _compareFunc = compareFunc;
@@ -77,5 +100,25 @@ namespace Tango.SharedUI.Components
 
             SelectionChanged?.Invoke(this, new EventArgs());
         }
+
+        public void Add(SelectedObject item)
+        {
+            base.Add((SelectedObject<T>)item);
+        }
+
+        public bool Contains(SelectedObject item)
+        {
+            return base.Contains((SelectedObject<T>)item);
+        }
+
+        public void CopyTo(SelectedObject[] array, int arrayIndex)
+        {
+            base.CopyTo(array.Cast<SelectedObject<T>>().ToArray(), arrayIndex);
+        }
+
+        public bool Remove(SelectedObject item)
+        {
+            return base.Remove((SelectedObject<T>)item);
+        }
     }
 }