aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Modules
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2023-07-04 17:00:49 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2023-07-04 17:00:49 +0300
commitb984ac29e1f9d13c854d96dd3016649df0f802f1 (patch)
tree4df206fa4fa6e0988fb2f6213d20200ae6d31f70 /Software/Visual_Studio/PPC/Modules
parent890a5a98072d12544e0fbfdf937d6a53fdcd907f (diff)
downloadTango-b984ac29e1f9d13c854d96dd3016649df0f802f1.tar.gz
Tango-b984ac29e1f9d13c854d96dd3016649df0f802f1.zip
Add “,” to long numbers
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml24
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml2
2 files changed, 13 insertions, 13 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index 165f251c3..fa8fc0b9d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -1029,7 +1029,7 @@
<Border Margin="140 0 0 0" BorderThickness="1" Height="44" CornerRadius="12" BorderBrush="{StaticResource TangoMidAccentBrush}" Visibility="{Binding ElementName=segmentsGrid, Path=DataContext.IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
<touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center"
Value="{Binding Length, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
- StringFormat="0.0" AutoCalculateJogStep="False"
+ StringFormat='#,0.0' AutoCalculateJogStep="False"
HasDecimalPoint="True" Minimum="1" Maximum="1000000"
KeyboardContainer="{Binding ElementName=Container}"
FontSize="18" ValueChangedEnd="Length_ValueChanged"
@@ -1039,7 +1039,7 @@
<Border Margin="140 0 0 0" BorderThickness="1" Height="44" CornerRadius="12" BorderBrush="{StaticResource TangoMidAccentBrush}" Visibility="{Binding ElementName=segmentsGrid, Path=DataContext.IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
<touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center"
Value="{Binding Weight, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
- StringFormat="0.0" AutoCalculateJogStep="False"
+ StringFormat="#,0.0" AutoCalculateJogStep="False"
HasDecimalPoint="True" Minimum="0" Maximum="100000"
KeyboardContainer="{Binding ElementName=Container}"
FontSize="18" RippleBrush="Transparent"/>
@@ -1197,14 +1197,14 @@
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSummaryOpened, Converter={StaticResource BooleanToVisibilityInverseConverter}, Mode=TwoWay}">
<TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
<Run Text="Copy:" FontWeight="Normal"></Run>
- <Run Text="{Binding JobModel.Length,Mode=OneWay,StringFormat=0.##}" FontWeight="DemiBold"/>
+ <Run Text="{Binding JobModel.Length,Mode=OneWay,StringFormat='#,0.##'}" FontWeight="DemiBold"/>
<Run Text="m" FontWeight="DemiBold"></Run>
</TextBlock>
<TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
<Run Text="Copy:" FontWeight="Normal"></Run>
<Run FontWeight="DemiBold">
<Run.Text>
- <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
+ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
<Binding Path="JobModel.Length" Mode="OneWay"/>
<Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
</MultiBinding>
@@ -1214,14 +1214,14 @@
</TextBlock>
<TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
<Run Text="Total:" FontWeight="Normal"></Run>
- <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat=0.##}" FontWeight="Bold"/>
+ <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat='#,0.##'}" FontWeight="Bold"/>
<Run Text="m" FontWeight="Bold"></Run>
</TextBlock>
<TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
<Run Text="Total:" FontWeight="Normal"></Run>
<Run FontWeight="Bold">
<Run.Text>
- <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
+ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
<Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
<Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
</MultiBinding>
@@ -1258,14 +1258,14 @@
<TextBlock Text="Total:" FontWeight="Bold" FontSize="{StaticResource TangoTitleFontSize}" ></TextBlock>
<TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
<Run Text="Copy:" FontWeight="Normal"></Run>
- <Run Text="{Binding JobModel.Length,Mode=OneWay,StringFormat=0.##}" FontWeight="Bold"/>
+ <Run Text="{Binding JobModel.Length,Mode=OneWay,StringFormat='#,0.##'}" FontWeight="Bold"/>
<Run Text="m" FontWeight="Bold"></Run>
</TextBlock>
<TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
<Run Text="Copy:" FontWeight="Normal"></Run>
<Run FontWeight="Bold">
<Run.Text>
- <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
+ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
<Binding Path="JobModel.Length" Mode="OneWay"/>
<Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
</MultiBinding>
@@ -1279,14 +1279,14 @@
</TextBlock>
<TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
<Run Text="Total:" FontWeight="Normal"></Run>
- <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat=0.##}" FontWeight="Bold"/>
+ <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat='#,0.##'}" FontWeight="Bold"/>
<Run Text="m" FontWeight="Bold"></Run>
</TextBlock>
<TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
<Run Text="Total:" FontWeight="Normal"></Run>
<Run FontWeight="Bold">
<Run.Text>
- <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
+ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
<Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
<Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
</MultiBinding>
@@ -1307,14 +1307,14 @@
</TextBlock>
<TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
<Run Text="Total:" FontWeight="Normal"></Run>
- <Run Text="{Binding JobModel.LengthIncludingNumberOfUnits,Mode=OneWay, StringFormat=0.##}" FontWeight="Bold"/>
+ <Run Text="{Binding JobModel.LengthIncludingNumberOfUnits,Mode=OneWay, StringFormat='#,0.##'}" FontWeight="Bold"/>
<Run Text="m" FontWeight="Bold"></Run>
</TextBlock>
<TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
<Run Text="Total:" FontWeight="Normal"></Run>
<Run FontWeight="Bold">
<Run.Text>
- <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
+ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
<Binding Path="JobModel.LengthIncludingNumberOfUnits" Mode="OneWay"/>
<Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
</MultiBinding>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
index 0e9e6d617..d3fdedde5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
@@ -264,7 +264,7 @@
<DataTemplate>
<TextBlock IsHitTestVisible="False">
<TextBlock.Text>
- <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.0" TargetNullValue='0' FallbackValue='0' Mode="OneWay">
+ <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="#,0.0" TargetNullValue='0' FallbackValue='0' Mode="OneWay">
<Binding Path="LengthIncludingNumberOfUnits" Mode="OneWay"/>
<Binding Path="DataContext.BuildProvider.IsEureka" Mode="OneWay" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
<Binding Path="Spools" Mode="OneWay"/>