Added tooltips to all liquid quantities.

Related Work Items: #2937

4 files changed, 53 insertions, 7 deletions

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
index e5f06e167..3ab013ab3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidQuantityToFormatStringConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidQuantityToFormatStringConverter.cs
@@ -15,11 +15,17 @@ namespace Tango.MachineStudio.Statistics.Converters
         {
             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}\nCubic Centimeters: {cc_val}\nLiters: {liters_val}\nDispensers: {dispensers_val}");
+                string tooltip = String.Format($"Nanoliters: {longValue.ToString(format)}\nCubic Centimeters: {cc_val}\nLiters: {liters_val}\nDispensers: {dispensers_val}");
                 return tooltip;
             }
             catch { }
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
new file mode 100644
index 000000000..6c4d1347f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/TooltipLiquidQuantityFormatConverter.cs
@@ -0,0 +1,38 @@
+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();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj
index 02e3f40a9..4ce0ea87d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Converters\NanoLiterToLiterFormatConverter.cs" />
     <Compile Include="Converters\StringToBoolYesNoNullConverter.cs" />
     <Compile Include="Converters\StringToFirstLetterConverter.cs" />
+    <Compile Include="Converters\TooltipLiquidQuantityFormatConverter.cs" />
     <Compile Include="Models\ExcelModel.cs" />
     <Compile Include="Models\TotalLiquidQuantityModel.cs" />
     <Compile Include="Models\JobRunModel.cs" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
index b3e93a52c..e6c46ba10 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
@@ -32,6 +32,7 @@
         <localConverters:JobLengthConverter x:Key="JobLengthConverter"/>
         <localConverters:NanoLiterToLiterFormatConverter x:Key="NanoLiterToLiterFormatConverter"/>
         <localConverters:LiquidQuantityToFormatStringConverter x:Key="LiquidQuantityToFormatStringConverter"/>
+        <localConverters:TooltipLiquidQuantityFormatConverter x:Key="TooltipLiquidQuantityFormatConverter"/>
 
         <ResourceDictionary x:Key="SelectAllTextBoxResource">
             <Style TargetType="TextBox">
@@ -518,7 +519,7 @@
                                 </ItemsControl.ItemsPanel>
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
-                                            <DockPanel  ToolTip="{Binding Quantity}" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="10">
+                                            <DockPanel  ToolTip="{Binding Quantity,  Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="10">
                                                 <Grid DockPanel.Dock="Top" Height="40" Margin="0 5 8 0" Width="16" >
                                                     <Border x:Name="LiquidTypeBorder"  BorderThickness="1" BorderBrush="{StaticResource borderBrush}"  CornerRadius="2" >
                                                         <Canvas x:Name="LiquidCanvas" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0" ClipToBounds="True" ToolTip="{Binding Quantity}" ToolTipService.Placement="Left" ToolTipService.VerticalOffset="10">
@@ -539,7 +540,7 @@
                                                                     </Style>
                                                                 </Border.Style>
                                                             </Border>
-                                                            <Border Background="Transparent" ToolTip="{Binding Quantity}" Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }"></Border>
+                                                            <Border Background="Transparent" ToolTip="{Binding Quantity, Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}" Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }"></Border>
                                                         </Canvas>
                                                     </Border>
                                                 </Grid>
@@ -589,7 +590,7 @@
                                     <StackPanel Orientation="Horizontal" Margin="0 3">
                                         <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                         <TextBlock Text=": "/>
-                                        <TextBlock Text="{Binding Value, StringFormat={}{0:#,0.##}}"/>
+                                        <TextBlock Text="{Binding Value, StringFormat={}{0:N2}}"/>
                                         <TextBlock Text="{Binding Unit}"/>
                                     </StackPanel>
                                 </DataTemplate>
@@ -634,7 +635,7 @@
                                                                     <StackPanel Orientation="Horizontal" Margin="2">
                                                                         <TextBlock Margin="5 0 0 0" Text="{Binding Name}" FontWeight="SemiBold"/>
                                                                         <TextBlock Text=": "/>
-                                                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/>
+                                                                        <TextBlock Text="{Binding Value, StringFormat={}{0:N0}}"/>
                                                                         <TextBlock Text="{Binding Unit}"/>
                                                                     </StackPanel>
                                                                 </DataTemplate>
@@ -694,7 +695,7 @@
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                    <Border Background="Transparent" ToolTip="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}}">
+                                    <Border Background="Transparent" ToolTip="{Binding Quantity, Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}">
                                         <StackPanel Orientation="Horizontal" Margin="4">
                                         <Ellipse Width="30" Height="30">
                                             <Ellipse.Fill>
@@ -713,7 +714,7 @@
                                 </DataTemplate>
                         </ItemsControl.ItemTemplate>
                         </ItemsControl>
-                        <Border Background="Transparent" ToolTip="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource LiquidQuantityToFormatStringConverter}}">
+                        <Border Background="Transparent" ToolTip="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}">
                         <TextBlock DockPanel.Dock="Bottom" Margin="4 10 0 0 ">
                             <Run Text="Total liquid quantities for all: " FontWeight="SemiBold"/>
                             <Run Text="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource NanoLiterToLiterFormatConverter}, ConverterParameter='0.00'}"></Run>