merge

17 files changed, 3 insertions, 438 deletions

diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/ByteArrayToFileSizeConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/ByteArrayToFileSizeConverter.cs
index d26ea5a0a..5a2975535 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/ByteArrayToFileSizeConverter.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/ByteArrayToFileSizeConverter.cs
@@ -39,7 +39,7 @@ namespace Tango.SharedUI.Converters
             long bytes = Math.Abs(byteCount);
             int place = System.Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
             double num = Math.Round(bytes / Math.Pow(1024, place), 1);
-            return (Math.Sign(byteCount) * num).ToString() + " " + suf[place];
+            return (Math.Sign(byteCount) * num).ToString() + suf[place];
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/DateTimeUtcToLocalDateTime.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/DateTimeUtcToLocalDateTime.cs
deleted file mode 100644
index 7ce4a6532..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/DateTimeUtcToLocalDateTime.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class DateTimeUtcToLocalDateTime : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                return ((DateTime)value).ToLocalTime();
-            }
-            catch
-            {
-                return value;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/EmptyStringToNullConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/EmptyStringToNullConverter.cs
deleted file mode 100644
index 8d62178c7..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/EmptyStringToNullConverter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class EmptyStringToNullConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                if (String.IsNullOrWhiteSpace(value.ToString()))
-                {
-                    return null;
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToIntConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToIntConverter.cs
deleted file mode 100644
index 43caff16c..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToIntConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class EnumToIntConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return (int)value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return Enum.ToObject(targetType, value);
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs
index 5c725e524..c551f7d49 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs
@@ -10,17 +10,6 @@ namespace Tango.SharedUI.Converters
 {
     public class EnumToItemsSourceConverter : IValueConverter
     {
-        public class EnumValue
-        {
-            public Object Value { get; set; }
-            public String DisplayName { get; set; }
-
-            public override string ToString()
-            {
-                return DisplayName;
-            }
-        }
-
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             Type result = value as Type;
@@ -31,7 +20,7 @@ namespace Tango.SharedUI.Converters
             }
             else
             {
-                return Enum.GetValues(result).Cast<object>().Select(e => new EnumValue() { Value = e, DisplayName = (e as Enum).ToDescription() }).ToList();
+                return Enum.GetValues(result).Cast<object>().Select(e => new { Value = e, DisplayName = (e as Enum).ToDescription() }).ToList();
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/FilePathToFileNameConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/FilePathToFileNameConverter.cs
deleted file mode 100644
index 7c59f8de7..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/FilePathToFileNameConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class FilePathToFileNameConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                if (value != null)
-                {
-                    return Path.GetFileName(value.ToString());
-                }
-            }
-            catch
-            {
-                return value;
-            }
-
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/GenericMessageProtocolToStringConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/GenericMessageProtocolToStringConverter.cs
deleted file mode 100644
index 11b58d3fd..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/GenericMessageProtocolToStringConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using Tango.PMR.Integration;
-
-namespace Tango.SharedUI.Converters
-{
-    public class GenericMessageProtocolToStringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                if (value != null)
-                {
-                    GenericMessageProtocol protocol = (GenericMessageProtocol)value;
-
-                    if (protocol == GenericMessageProtocol.Json)
-                    {
-                        return "v1";
-                    }
-                    else
-                    {
-                        return "v2";
-                    }
-                }
-            }
-            catch { }
-
-            return "Unspecified";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/IsEqualToVisibilityConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/IsEqualToVisibilityConverter.cs
deleted file mode 100644
index 846e0505f..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/IsEqualToVisibilityConverter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class IsEqualToVisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                return value.Equals(System.Convert.ChangeType(parameter, value.GetType())) ? Visibility.Visible : Visibility.Collapsed;
-            }
-            catch
-            {
-                return Visibility.Collapsed;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/IsToStringEqualToVisibilityConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/IsToStringEqualToVisibilityConverter.cs
deleted file mode 100644
index 478b21c09..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/IsToStringEqualToVisibilityConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class IsToStringEqualToVisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value.ToStringSafe().Equals(parameter.ToStringSafe());
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/ObservableCollectionToViewSourceConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/ObservableCollectionToViewSourceConverter.cs
deleted file mode 100644
index a2363575a..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/ObservableCollectionToViewSourceConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class ObservableCollectionToViewSourceConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            String sortMember = parameter != null ? parameter.ToString() : null;
-            IList list = value as IList;
-            if (list != null)
-            {
-                var view = CollectionViewSource.GetDefaultView(list);
-                view.SortDescriptions.Clear();
-
-                //Delay because the DataGrid clears the sort description after source change.
-                Task.Factory.StartNew(() =>
-                {
-                    Thread.Sleep(10);
-
-                    Application.Current.Dispatcher.BeginInvoke(new Action(() =>
-                    {
-                        view.SortDescriptions.Add(new SortDescription(sortMember, ListSortDirection.Ascending));
-                        view.Refresh();
-                    }));
-                });
-                return view;
-            }
-
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/StringEllipsisConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/StringEllipsisConverter.cs
index 7e534d7f0..f5b4dea87 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/StringEllipsisConverter.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/StringEllipsisConverter.cs
@@ -14,14 +14,7 @@ namespace Tango.SharedUI.Converters
         {
             try
             {
-                if (value != null)
-                {
-                    return value.ToString().Ellipsis(System.Convert.ToInt32(parameter));
-                }
-                else
-                {
-                    return value;
-                }
+                return value.ToString().Ellipsis(System.Convert.ToInt32(parameter));
             }
             catch
             {
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/StringToOneLineConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/StringToOneLineConverter.cs
deleted file mode 100644
index da5717875..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/StringToOneLineConverter.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class StringToOneLineConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                string str = value.ToString();
-                int newLineIndex = str.IndexOf("\n");
-
-                if (newLineIndex == -1)
-                {
-                    newLineIndex = str.IndexOf(Environment.NewLine);
-                }
-
-                string firstline = str;
-
-                if (newLineIndex > 0)
-                {
-                    firstline = str.Substring(0, newLineIndex);
-                }
-
-                if (parameter != null)
-                {
-                    firstline = firstline.Ellipsis(System.Convert.ToInt32(parameter));
-                }
-
-                return firstline.Trim();
-            }
-            else
-            {
-                return value;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/StringToTitleCaseConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/StringToTitleCaseConverter.cs
deleted file mode 100644
index 6bafd1fd0..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/StringToTitleCaseConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class StringToTitleCaseConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                return value.ToString().ToTitleCase();
-            }
-            else
-            {
-                return value;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToDaysConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToDaysConverter.cs
deleted file mode 100644
index d9256ac08..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToDaysConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class TimeSpanToDaysConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return ((TimeSpan)value).TotalDays;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return TimeSpan.FromDays(double.Parse(value.ToString()));
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToMinutesConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToMinutesConverter.cs
deleted file mode 100644
index c81c54eed..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToMinutesConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class TimeSpanToMinutesConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return ((TimeSpan)value).TotalMinutes;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return TimeSpan.FromMinutes(double.Parse(value.ToString()));
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToSecondsConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToSecondsConverter.cs
deleted file mode 100644
index 6632ac27d..000000000
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToSecondsConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.SharedUI.Converters
-{
-    public class TimeSpanToSecondsConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return ((TimeSpan)value).TotalSeconds;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return TimeSpan.FromSeconds(double.Parse(value.ToString()));
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToTwoDigitsTimeConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToTwoDigitsTimeConverter.cs
index 8946020bf..fb162d29b 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToTwoDigitsTimeConverter.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/TimeSpanToTwoDigitsTimeConverter.cs
@@ -12,9 +12,6 @@ namespace Tango.SharedUI.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value == null)
-                return "";
-
             TimeSpan time = (TimeSpan)value;
 
             if (time.TotalHours > 1)