Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

4 files changed, 54 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
new file mode 100644
index 000000000..e5f06e167
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/LiquidQuantityToFormatStringConverter.cs
@@ -0,0 +1,35 @@
+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
+            {
+                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}");
+                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/NanoLiterToLiterFormatConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
index 32050cdb1..97f4ec066 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
@@ -16,7 +16,12 @@ namespace Tango.MachineStudio.Statistics.Converters
             {
                 var longValue = System.Convert.ToUInt64(value.ToString());
                 double val = (longValue / 1000000000d);
-                return val.ToString("0.0");
+                if (parameter is string)
+                {
+                    string format= (string)parameter;
+                    return val.ToString(format);
+                }
+                return val.ToString();
             }
             catch { }
 
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 e484754bc..02e3f40a9 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
@@ -79,6 +79,7 @@
     <Compile Include="Converters\CollectionConverter .cs" />
     <Compile Include="Converters\DateTimeToStringFormatConverter.cs" />
     <Compile Include="Converters\JobLengthConverter.cs" />
+    <Compile Include="Converters\LiquidQuantityToFormatStringConverter.cs" />
     <Compile Include="Converters\LiquidTypeToColorConverter.cs" />
     <Compile Include="Converters\MidTankLevelToElementHeightConverter.cs" />
     <Compile Include="Converters\NanoLiterToLiterFormatConverter.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 4ce6030d9..2e6770d9e 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
@@ -31,6 +31,7 @@
         <localConverters:MidTankLevelToElementHeightConverter x:Key="MidTankLevelToElementHeightConverter"/>
         <localConverters:JobLengthConverter x:Key="JobLengthConverter"/>
         <localConverters:NanoLiterToLiterFormatConverter x:Key="NanoLiterToLiterFormatConverter"/>
+        <localConverters:LiquidQuantityToFormatStringConverter x:Key="LiquidQuantityToFormatStringConverter"/>
 
         <ResourceDictionary x:Key="SelectAllTextBoxResource">
             <Style TargetType="TextBox">
@@ -518,10 +519,10 @@
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
                                             <DockPanel  ToolTip="{Binding Quantity}" 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">
+                                                <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">
-                                                            <Border  Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }">
+                                                            <Border  Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }" >
                                                                 <Border.Background>
                                                                     <SolidColorBrush Color="{Binding LiquidType,Converter={StaticResource LiquidTypeToColorConverter}}" />
                                                                 </Border.Background>
@@ -538,6 +539,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>
                                                         </Canvas>
                                                     </Border>
                                                 </Grid>
@@ -692,7 +694,8 @@
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                    <StackPanel Orientation="Horizontal" Margin="4">
+                                    <Border Background="Transparent" ToolTip="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}}">
+                                        <StackPanel Orientation="Horizontal" Margin="4">
                                         <Ellipse Width="30" Height="30">
                                             <Ellipse.Fill>
                                                 <SolidColorBrush Color="{Binding LiquidType,Converter={StaticResource LiquidTypeToColorConverter}}" />
@@ -701,17 +704,19 @@
                                         <StackPanel Orientation="Vertical" Margin="4">
                                             <TextBlock Text="{Binding LiquidType,Converter={StaticResource EnumToDescriptionConverter}}" FontWeight="SemiBold"></TextBlock>
                                             <TextBlock >
-                                             <Run Text="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}}"></Run>
+                                             <Run Text="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}, ConverterParameter='0.00'}"></Run>
                                             <Run Text=" liters"></Run>
                                             </TextBlock>
                                         </StackPanel>
                                     </StackPanel>
+                                    </Border>
                                 </DataTemplate>
                         </ItemsControl.ItemTemplate>
                         </ItemsControl>
+                        <Border Background="Transparent" ToolTip="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource LiquidQuantityToFormatStringConverter}}">
                         <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}}"></Run>
+                            <Run Text="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource NanoLiterToLiterFormatConverter}, ConverterParameter='0.00'}"></Run>
                             <Run Text=" liters"></Run>
                             <TextBlock.Style>
                                 <Style TargetType="TextBlock">
@@ -724,6 +729,7 @@
                                 </Style>
                             </TextBlock.Style>
                         </TextBlock>
+                        </Border>
                     </DockPanel>
                 </Border>
             </Grid>