xia.silei/AohDrllTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复EA刀叠板查表直径区间匹配，叠板区改为折叠输入即算

Browse Source 
EA刀/短槽刀列按参数表下限区间 [0.60,0.65)/[0.65,0.70)/[0.70,0.75)/>=0.75 匹配，修复 0.706mm 等刀径查表失败；叠板计算改为 Expander 默认收折、移除计算按钮、输入变化自动计算。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
夏斯雷
2026-06-29 22:01:15 +08:00
parent c0e4bb72cd
commit 8d6efa9e86
5 changed files with 95 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
StartupSelectionWindow.xaml
View File

@@ -22,8 +22,6 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
@@ -92,46 +90,44 @@
Text="{Binding Outer3175YSpacing, StringFormat=Y间距: {0:F3}}" />
</StackPanel>
<!-- 叠板计算输入行 -->
<Grid Grid.Row="3" Margin="0,8,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="80" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="60" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<!-- 叠板计算（折叠式，默认收折） -->
<Expander Grid.Row="3" Margin="0,8,0,0"
Header="叠板计算"
IsExpanded="False">
<Grid Margin="0,5,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Column="0" VerticalAlignment="Center" Text="板厚(mm)：" />
<TextBox Grid.Column="1"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Text="{Binding BoardThicknessInput, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Grid.Column="2" Margin="15,0,0,0" VerticalAlignment="Center" Text="单张总铜厚(oz)：" />
<TextBox Grid.Column="3"
Width="60"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Text="{Binding CopperThicknessInput, UpdateSourceTrigger=PropertyChanged}" />
<Button Grid.Column="4" Margin="10,0,0,0"
Width="75" Height="25"
Content="计算叠板"
IsEnabled="{Binding CanCalculate}"
Click="CalculateStackCount_Click" />
</Grid>
<!-- 输入行 -->
<StackPanel Grid.Row="0" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="板厚(mm)：" />
<TextBox Width="70"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Text="{Binding BoardThicknessInput, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Margin="15,0,0,0" VerticalAlignment="Center" Text="铜厚(oz)：" />
<TextBox Width="60"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Text="{Binding CopperThicknessInput, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<!-- 叠板计算结果行 -->
<TextBlock Grid.Row="4" Margin="0,5,0,0"
VerticalAlignment="Center"
FontWeight="Bold"
Text="{Binding StackCountResult}" />
<!-- 结果行 -->
<TextBlock Grid.Row="1" Margin="0,5,0,0"
VerticalAlignment="Center"
FontWeight="Bold"
Text="{Binding StackCountResult}" />
<!-- 叠板计算明细行 -->
<TextBlock Grid.Row="5" Margin="0,2,0,0"
Text="{Binding StackCountDetail}"
TextWrapping="Wrap"
Visibility="{Binding StackCountDetail, Converter={StaticResource NonEmptyToVisibilityConverter}}" />
<!-- 明细行 -->
<TextBlock Grid.Row="2" Margin="0,2,0,0"
Text="{Binding StackCountDetail}"
TextWrapping="Wrap"
Visibility="{Binding StackCountDetail, Converter={StaticResource NonEmptyToVisibilityConverter}}" />
</Grid>
</Expander>
</Grid>
</GroupBox>