Skip to content

H
hemei
Commit 1c3aa2cb authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

添加 称重 V5版， 主界面添加 "平均密度"

parent 9d4a2ba7
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 8 deletions
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/UcThicknessV5.xaml
View file @ 1c3aa2cb
...@@ -42,12 +42,14 @@ ...@@ -42,12 +42,14 @@
<Run Text="m/min" Style="{StaticResource RunStyle_unit}" /> <Run Text="m/min" Style="{StaticResource RunStyle_unit}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Margin="3" > <StackPanel Margin="3">
<TextBlock Text="理论线速度" Style="{StaticResource TextBlockStyle_title}" /> <TextBlock Text="平均密度" Style="{StaticResource TextBlockStyle_title}" />
<TextBlock > <Viewbox Height="{StaticResource FontSize_text}" HorizontalAlignment="Left" >
<Run Text="{Binding Accessory.TargetVelocity,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" /> <TextBlock >
<Run Text="m/min" Style="{StaticResource RunStyle_unit}" /> <Run Text="{Binding Accessory.Density,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
</TextBlock> <Run Text="kg/m³" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</Viewbox>
</StackPanel> </StackPanel>
<StackPanel Margin="3" Background="{StaticResource Color_background2}" > <StackPanel Margin="3" Background="{StaticResource Color_background2}" >
<TextBlock Text="当前线速度" Style="{StaticResource TextBlockStyle_title}" /> <TextBlock Text="当前线速度" Style="{StaticResource TextBlockStyle_title}" />
...@@ -56,7 +58,13 @@ ...@@ -56,7 +58,13 @@
<Run Text="m/min" Style="{StaticResource RunStyle_unit}" /> <Run Text="m/min" Style="{StaticResource RunStyle_unit}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Margin="3" >
<TextBlock Text="理论线速度" Style="{StaticResource TextBlockStyle_title}" />
<TextBlock >
<Run Text="{Binding Accessory.TargetVelocity,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
<Run Text="m/min" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
</StackPanel> </StackPanel>
</Viewbox> </Viewbox>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/UcThicknessV5.xaml.cs
View file @ 1c3aa2cb
...@@ -45,8 +45,10 @@ namespace FLY.Weight.UI.Client.UiModule ...@@ -45,8 +45,10 @@ namespace FLY.Weight.UI.Client.UiModule
nameof(Common.WeighterAccessory.TotalFilmWidth), nameof(Common.WeighterAccessory.TotalFilmWidth),
nameof(Common.WeighterAccessory.SetThickness), nameof(Common.WeighterAccessory.SetThickness),
nameof(Common.WeighterAccessory.Thickness), nameof(Common.WeighterAccessory.Thickness),
nameof(Common.WeighterAccessory.Density),
nameof(Common.WeighterAccessory.TargetVelocity), nameof(Common.WeighterAccessory.TargetVelocity),
nameof(Common.WeighterAccessory.CurrentVelocity) nameof(Common.WeighterAccessory.CurrentVelocity),
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment