merge

10 files changed, 0 insertions, 385 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/CollectionConverter .cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/CollectionConverter .cs
deleted file mode 100644
index 2d9a3cfd9..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/CollectionConverter .cs
+++ /dev/null
@@ -1,48 +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.MachineStudio.Statistics.Converters
-{
-    public class CollectionConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if(value != null && value is System.Collections.IEnumerable)
-            {
-                var colection = value as System.Collections.IEnumerable;
-                var text = new StringBuilder();
-                foreach(var val in colection)
-                {
-                    string visibleText = val.ToString();
-                    if(val is bool && parameter is string)
-                    {
-                        string[] tokens = (parameter as string).Split(',');
-                        if(tokens.Count() > 1)
-                        {
-                            visibleText = (bool)val == true ? tokens[1] : tokens[0];
-                        }
-                    }
-                    text.Append(visibleText);
-                    text.Append("/");
-                }
-                string str_text = text.ToString();
-                if(str_text.Length > 1)
-                {
-                    str_text = str_text.Remove(str_text.Length - 1);
-                }
-                return str_text;
-            }
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/DateTimeToStringFormatConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/DateTimeToStringFormatConverter.cs
deleted file mode 100644
index 6b5154ce3..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/DateTimeToStringFormatConverter.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.MachineStudio.Statistics.Converters
-{
-    public class DateTimeToStringFormatConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                return ((TimeSpan)value).ToString(@"hh\:mm\:ss");
-            }
-            else
-            {
-                return TimeSpan.FromSeconds(0).ToString(@"hh\:mm\:ss");
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
deleted file mode 100644
index cd928d9c9..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
+++ /dev/null
@@ -1,41 +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.MachineStudio.Statistics.Converters
-{
-    public class JobLengthConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                if (values != null && values.Count() == 3)
-                {
-                    double length = (double)values[0];
-                    double endPoint = (double)values[1];
-                    double width = (double)values[2];
-                    var v = Math.Round((endPoint / length) * width, MidpointRounding.AwayFromZero);
-
-                    if (double.IsInfinity(v))
-                    {
-                        return 0d;
-                    }
-                    return v;
-                }
-            }
-            catch { }
-
-            return 0d;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidQuantityToFormatStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidQuantityToFormatStringConverter.cs
deleted file mode 100644
index 3ab013ab3..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidQuantityToFormatStringConverter.cs
+++ /dev/null
@@ -1,41 +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.MachineStudio.Statistics.Converters
-{
-    public class LiquidQuantityToFormatStringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                string format = "";
-                if (parameter is string)
-                {
-                    format = (string)parameter;
-                }
-
-                var longValue = System.Convert.ToUInt64(value.ToString());
-                double liters_val = (longValue / 1000000000d);
-                double cc_val = (longValue / 1000000d);
-                double dispensers_val = (longValue / 130000000d);
-                string tooltip = String.Format($"Nanoliters: {longValue.ToString(format)}\nCubic Centimeters: {cc_val}\nLiters: {liters_val}\nDispensers: {dispensers_val}");
-                return tooltip;
-            }
-            catch { }
-
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidTypeToColorConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidTypeToColorConverter.cs
deleted file mode 100644
index b36bf608e..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidTypeToColorConverter.cs
+++ /dev/null
@@ -1,43 +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 System.Windows.Media;
-using Tango.BL;
-using Tango.BL.Enumerations;
-
-namespace Tango.MachineStudio.Statistics.Converters
-{
-    public class LiquidTypeToColorConverter : IValueConverter
-    {
-        private static Dictionary<LiquidTypes,Color> liquidTypes;
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (liquidTypes == null)
-            {
-                liquidTypes = new Dictionary<LiquidTypes, Color>();
-
-                foreach (var type in ObservablesStaticCollections.Instance.LiquidTypes.ToList())
-                {
-                    liquidTypes.Add(type.Type, type.LiquidTypeColor);
-                }
-            }
-
-            if (value != null)
-            {
-                return liquidTypes[(LiquidTypes)value];
-            }
-
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/MidTankLevelToElementHeightConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/MidTankLevelToElementHeightConverter.cs
deleted file mode 100644
index de002046e..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/MidTankLevelToElementHeightConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace Tango.MachineStudio.Statistics.Converters
-{
-    public class MidTankLevelToElementHeightConverter : IMultiValueConverter
-    {
-        public const double MAX_QUANTITY = 130000000;
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                double parentActualHeight;
-                Double.TryParse(values[0].ToString(), out parentActualHeight);
-                double quantity;
-                Double.TryParse(values[1].ToString(), out quantity);
-                
-                double  midTankLevel = (double)Math.Min(quantity, MAX_QUANTITY);
-                double delta = ((midTankLevel / MAX_QUANTITY) * parentActualHeight);
-                if (quantity > 0 && midTankLevel < (MAX_QUANTITY/10))// if quantity < 10|% set 2 pixel 
-                    delta = 2.0;
-                var test = delta;
-                return parentActualHeight - delta;
-            }
-            catch
-            {
-                return 0d;
-            }
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
deleted file mode 100644
index 97f4ec066..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
+++ /dev/null
@@ -1,36 +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.MachineStudio.Statistics.Converters
-{
-    public class NanoLiterToLiterFormatConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                var longValue = System.Convert.ToUInt64(value.ToString());
-                double val = (longValue / 1000000000d);
-                if (parameter is string)
-                {
-                    string format= (string)parameter;
-                    return val.ToString(format);
-                }
-                return val.ToString();
-            }
-            catch { }
-
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/StringToBoolYesNoNullConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/StringToBoolYesNoNullConverter.cs
deleted file mode 100644
index f7633a7d0..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/StringToBoolYesNoNullConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Tango.MachineStudio.Statistics.Converters
-{
-    public class StringToBoolYesNoNullConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if(value is bool)
-            {
-                return (bool)value ? "Yes" : "No";
-            }
-            return "Null";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            //throw new NotImplementedException();
-            if (value is ComboBoxItem)
-            {
-                string str_val = ((ComboBoxItem)value).Content.ToString();
-                if (str_val.ToUpper() == "NO")
-                    return false;
-                if (str_val.ToUpper() == "YES")
-                    return true;
-            }
-            return null;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/StringToFirstLetterConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/StringToFirstLetterConverter.cs
deleted file mode 100644
index a1c9561b9..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/StringToFirstLetterConverter.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.MachineStudio.Statistics.Converters
-{
-    public class StringToFirstLetterConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null && value.ToString().Length > 1)
-            {
-                return value.ToString().First().ToString();
-            }
-            else
-            {
-                return value;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/TooltipLiquidQuantityFormatConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/TooltipLiquidQuantityFormatConverter.cs
deleted file mode 100644
index 6c4d1347f..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/TooltipLiquidQuantityFormatConverter.cs
+++ /dev/null
@@ -1,38 +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.MachineStudio.Statistics.Converters
-{
-    class TooltipLiquidQuantityFormatConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            try
-            {
-                string format = "";
-                if (parameter is string)
-                {
-                    format = (string)parameter;
-                }
-                var longValue = System.Convert.ToUInt64(value.ToString());
-                decimal liters_val = (decimal)(longValue / 1000000000d);
-                decimal cc_val = (decimal)(longValue / 1000000d);
-                decimal dispensers_val = (decimal)(longValue / 130000000d);
-                string tooltip = String.Format($"Nanoliters: {longValue.ToString(format)}\nCubic Centimeters: {cc_val}\nLiters: {liters_val}\nDispensers: {dispensers_val}");
-                return tooltip;
-            }
-            catch { }
-
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}