Skip to content

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

称重客户端 添加V5 的层厚度比例

parent d748e4ba
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 22 deletions
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/UcWeighterItemV5.xaml
View file @ a0a9ff85
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Border Style="{StaticResource BorderStyle_block}" d:DataContext="{StaticResource weightSystemUt}"> <Border Style="{StaticResource BorderStyle_block}" d:DataContext="{StaticResource weightSystemUt}">
<Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[3]}" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly"> <Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[2]}" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly">
<StackPanel > <StackPanel >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto" MinWidth="120"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
...@@ -125,8 +125,8 @@ ...@@ -125,8 +125,8 @@
</StackPanel> </StackPanel>
</Button> </Button>
</Grid> </Grid>
<Grid Grid.Column="1"> <Grid Grid.Column="1" Margin="3" >
<StackPanel Margin="3" VerticalAlignment="Center" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}"> <StackPanel VerticalAlignment="Center" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
<TextBlock Text="配料" Style="{StaticResource TextBlockStyle_title_activity}"/> <TextBlock Text="配料" Style="{StaticResource TextBlockStyle_title_activity}"/>
<flyctrl:ToggleButtonOnOff Width="auto" <flyctrl:ToggleButtonOnOff Width="auto"
IsChecked="{Binding MixIsOn}" IsChecked="{Binding MixIsOn}"
...@@ -135,19 +135,16 @@ ...@@ -135,19 +135,16 @@
> >
</flyctrl:ToggleButtonOnOff> </flyctrl:ToggleButtonOnOff>
</StackPanel> </StackPanel>
<Button Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}"
Style="{StaticResource Styles.Button.Empty}" Click="button_density_Click" Tag="{Binding .}"> <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}" >
<StackPanel Margin="3" > <TextBlock Text="厚度比" Style="{StaticResource TextBlockStyle_title}"/>
<TextBlock Text="密度" Style="{StaticResource TextBlockStyle_title_activity}"/> <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
<Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
<TextBlock > <TextBlock >
<Run Text="{Binding Density,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text_activity}" /> <Run Text="{Binding ThicknessPercent,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}"/>
<Run Text="kg/m³" Style="{StaticResource RunStyle_unit}" /> <Run Text="%" Style="{StaticResource RunStyle_unit}" />
</TextBlock> </TextBlock>
</Viewbox> </Viewbox>
</StackPanel> </StackPanel>
</Button>
</Grid> </Grid>
<StackPanel Margin="3" Grid.Row="1" > <StackPanel Margin="3" Grid.Row="1" >
...@@ -160,7 +157,8 @@ ...@@ -160,7 +157,8 @@
</Viewbox> </Viewbox>
</StackPanel> </StackPanel>
<StackPanel Margin="3" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}"> <Grid Margin="3" Grid.Row="1" Grid.Column="1" >
<StackPanel VerticalAlignment="Center" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
<TextBlock Text="卸料阀" Style="{StaticResource TextBlockStyle_title_activity}"/> <TextBlock Text="卸料阀" Style="{StaticResource TextBlockStyle_title_activity}"/>
<flyctrl:ToggleButtonOnOff Width="auto" <flyctrl:ToggleButtonOnOff Width="auto"
IsChecked="{Binding BucketValveIsOpen}" IsChecked="{Binding BucketValveIsOpen}"
...@@ -169,6 +167,20 @@ ...@@ -169,6 +167,20 @@
> >
</flyctrl:ToggleButtonOnOff> </flyctrl:ToggleButtonOnOff>
</StackPanel> </StackPanel>
<Button Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}"
Style="{StaticResource Styles.Button.Empty}" Click="button_density_Click" Tag="{Binding .}">
<StackPanel >
<TextBlock Text="密度" Style="{StaticResource TextBlockStyle_title_activity}"/>
<Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
<TextBlock >
<Run Text="{Binding Density,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text_activity}" />
<Run Text="kg/m³" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</Viewbox>
</StackPanel>
</Button>
</Grid>
<StackPanel Grid.Row="2" > <StackPanel Grid.Row="2" >
<Button Style="{StaticResource Styles.Button.Empty}" Background="Transparent" Click="button_frequency_Click" <Button Style="{StaticResource Styles.Button.Empty}" Background="Transparent" Click="button_frequency_Click"
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/UcWeighterItemV5_2.xaml
View file @ a0a9ff85
...@@ -130,6 +130,13 @@ ...@@ -130,6 +130,13 @@
<Run Text="um" Style="{StaticResource RunStyle_unit}" /> <Run Text="um" Style="{StaticResource RunStyle_unit}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel >
<TextBlock Text="厚度比" Style="{StaticResource TextBlockStyle_title}"/>
<TextBlock >
<Run Text="{Binding ThicknessPercent,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}"/>
<Run Text="%" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Margin="3" > <StackPanel Margin="3" >
<TextBlock Text="密度" Style="{StaticResource TextBlockStyle_title_activity}"/> <TextBlock Text="密度" Style="{StaticResource TextBlockStyle_title_activity}"/>
<TextBlock > <TextBlock >
......
Project.FLY.Weight/FLY.Weight.UI.Client/UnitTests/WeightSystemUt.cs
View file @ a0a9ff85
...@@ -46,7 +46,7 @@ namespace FLY.Weight.UI.Client.UnitTests ...@@ -46,7 +46,7 @@ namespace FLY.Weight.UI.Client.UnitTests
{ {
Random random = new Random(); Random random = new Random();
//BinCnts = new int[] { 6, 2, 0 }; //BinCnts = new int[] { 6, 2, 0 };
BinCnts = new int[] { 6, 2, 0, 2, 6 }; BinCnts = new int[] { 6, 2, 1, 2, 6 };
//BinCnts = new int[] { 6, 2, 0, 2, 6, 4, 3, 6, 6 }; //BinCnts = new int[] { 6, 2, 0, 2, 6, 4, 3, 6, 6 };
ItemsCnt = BinCnts.Count(); ItemsCnt = BinCnts.Count();
......
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