diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-10-22 16:43:49 +0300 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-10-22 16:43:49 +0300 |
| commit | 4cebc14d3183ee4dc4ade0f85d9bf72cec44533c (patch) | |
| tree | b940003b7572fa616fd385ef5c5be00b06f5c01b /Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | |
| parent | f35fea4ffd1219e844f94a0b72c12cc91af2c94e (diff) | |
| parent | 648437dec6e56e32218d88b7a85e70ac00b6e98a (diff) | |
| download | Tango-4cebc14d3183ee4dc4ade0f85d9bf72cec44533c.tar.gz Tango-4cebc14d3183ee4dc4ade0f85d9bf72cec44533c.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index 0436cdab6..f9338b813 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -558,7 +558,7 @@ <Image Source="../Images/Job Issues/spools.png" Stretch="None" VerticalAlignment="Top"/> <StackPanel Orientation="Vertical" Margin="15 0 0 0"> <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Spools</TextBlock> - <TextBlock Text="{Binding Job.Spools, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock> + <TextBlock Text="{Binding Job.NumberOfSpools, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock> </StackPanel> </StackPanel> </UniformGrid> @@ -650,6 +650,7 @@ <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" /> <Binding Path="IsSpoolView"/> <Binding Path="RunningJobStatus.ProgressMinusSettingUp" /> + <Binding Path="Job.NumberOfSpools"/> </MultiBinding> </TextBlock.Text> </TextBlock> @@ -659,6 +660,7 @@ <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="#,0" TargetNullValue='-' FallbackValue='0' Mode="OneWay"> <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/> <Binding Path="IsSpoolView"/> + <Binding Path="Job.NumberOfSpools"/> </MultiBinding> </TextBlock.Text> </TextBlock> @@ -673,6 +675,7 @@ <Binding Path="IsSpoolView"/> <Binding Path="RunningJobStatus.ProgressMinusSettingUp" /> <Binding Path="Job.GramPerLength" Mode="OneWay"/> + <Binding Path="Job.NumberOfSpools"/> </MultiBinding> </TextBlock.Text> </TextBlock> @@ -683,6 +686,7 @@ <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/> <Binding Path="IsSpoolView"/> <Binding Path="Job.GramPerLength" Mode="OneWay"/> + <Binding Path="Job.NumberOfSpools"/> </MultiBinding> </TextBlock.Text> </TextBlock> @@ -792,7 +796,7 @@ <TextBlock.Text> <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="#,0" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> - <Binding Path="Job.Spools" Mode="OneWay"/> + <Binding Path="Job.NumberOfSpools" Mode="OneWay"/> </MultiBinding> </TextBlock.Text> </TextBlock> @@ -807,7 +811,7 @@ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> <Binding Path="Job.GramPerLength" Mode="OneWay"/> - <Binding Path="Job.Spools" Mode="OneWay"/> + <Binding Path="Job.NumberOfSpools" Mode="OneWay"/> </MultiBinding> </TextBlock.Text> </TextBlock> @@ -830,6 +834,7 @@ <Setter.Value> <MultiBinding Converter="{StaticResource ProgressUnitSpoolConverter}" TargetNullValue='-' FallbackValue='-' > <Binding Path="RunningJobStatus.CurrentUnit" Mode="OneWay"/> + <Binding Path="Job.NumberOfSpools" Mode="OneWay"/> </MultiBinding> </Setter.Value> </Setter> @@ -1019,7 +1024,7 @@ <TextBlock.Text> <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="#,0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> - <Binding Path="Job.Spools" Mode="OneWay"/> + <Binding Path="Job.NumberOfSpools" Mode="OneWay"/> </MultiBinding> </TextBlock.Text> </TextBlock> |