diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-07 14:12:17 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-07 14:12:17 +0300 |
| commit | 337018f9479cd6c66ecbfef3dfba6afc2273e077 (patch) | |
| tree | b7dd4007ec8fb9c2fbd53d4ba72b83ffec75272d /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views | |
| parent | ad65c02d1a8e7db0fa51bccfc282f274d489de25 (diff) | |
| parent | 94407c0a36503c1486dd847dfe754626d8725075 (diff) | |
| download | Tango-337018f9479cd6c66ecbfef3dfba6afc2273e077.tar.gz Tango-337018f9479cd6c66ecbfef3dfba6afc2273e077.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 6d10e910e..1b96b27ce 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -753,7 +753,11 @@ <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" FontSize="16" FontStyle="Italic" Foreground="Gray"> <Run>Total:</Run> - <Run Text="{Binding LiquidVolumesSum,Mode=OneWay,StringFormat=0}"></Run> + <Run Text="{Binding TotalLiquidVolume,Mode=OneWay,StringFormat=0}"></Run><Run>%</Run> + <Run>(</Run> + <Run FontSize="10" Text="{Binding TotalLiquidNanoliterPerCentimeter,Mode=OneWay,StringFormat=0.00}"></Run> + <Run FontSize="12">nl</Run> + <Run>)</Run> </TextBlock> </StackPanel> </Setter.Value> @@ -1000,7 +1004,7 @@ <DataGridTemplateColumn.CellTemplate> <DataTemplate> <TextBlock VerticalAlignment="Center"> - <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.0'}"></Run> + <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.00'}"></Run> <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run> </TextBlock> </DataTemplate> |