diff options
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.BL/Entities/Rml.cs | 27 |
2 files changed, 15 insertions, 16 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 614da8fea..b80c245de 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -620,7 +620,7 @@ <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <TextBlock FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center"> <TextBlock.Text> - <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0.0" TargetNullValue='-' FallbackValue='0' Mode="OneWay"> + <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay"> <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" /> <Binding Path="IsSpoolView"/> <Binding Path="RunningJobStatus.ProgressMinusSettingUp" /> @@ -744,7 +744,7 @@ <TextBlock x:Name="ProgressLength" VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length (m)</TextBlock> <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"> <TextBlock.Text> - <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> + <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> <Binding Path="Job.Spools" Mode="OneWay"/> </MultiBinding> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs index 23aee0366..fdeb8f05e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs @@ -310,20 +310,19 @@ namespace Tango.BL.Entities get { - if (LinearMassDensityUnit == null || FiberSize == 0) - return 1; - if (LinearMassDensityUnit.Name == "Tex") - return FiberSize; - if (LinearMassDensityUnit.Name == "DTEX") - return (FiberSize /10); - if (LinearMassDensityUnit.Name == "Ne") - return (590.5 / FiberSize); - if (LinearMassDensityUnit.Name == "Nm") - return (1000 / FiberSize); - if (LinearMassDensityUnit.Name == "Denier") - return FiberSize/9; - - return 1; + + //if (LinearMassDensityUnit.Name == "Tex") + // return FiberSize; + //if (LinearMassDensityUnit.Name == "DTEX") + // return (FiberSize /10); + //if (LinearMassDensityUnit.Name == "Ne") + // return (590.5 / FiberSize); + //if (LinearMassDensityUnit.Name == "Nm") + // return (1000 / FiberSize); + //if (LinearMassDensityUnit.Name == "Denier") + // return FiberSize/9; + + return DencityCount == 0? (1/9 ): (DencityCount / 9); } } |