Merge branch 'Develop/XP' into turbo-002-cnc

# Conflicts:
#	XplorePlane/Views/Main/MainWindow.xaml
This commit is contained in:
zhengxuan.zhang
2026-05-06 15:37:58 +08:00
43 changed files with 1926 additions and 248 deletions
+13 -18
View File
@@ -195,8 +195,6 @@
</StackPanel>
</telerik:RadRibbonGroup>
<telerik:RadRibbonGroup Header="测量工具">
<telerik:RadRibbonGroup.Variants>
<telerik:GroupVariant Priority="0" Variant="Large" />
@@ -209,14 +207,14 @@
telerik:ScreenTip.Title="点点距测量"
Command="{Binding PointDistanceMeasureCommand}"
Size="Medium"
SmallImage="/Assets/Icons/crosshair.png"
SmallImage="/Assets/Icons/ptop.png"
Text="点点距测量" />
<telerik:RadRibbonButton
telerik:ScreenTip.Description="测量点到直线的距离"
telerik:ScreenTip.Title="点线距测量"
Command="{Binding PointLineDistanceMeasureCommand}"
Size="Medium"
SmallImage="/Assets/Icons/mark.png"
SmallImage="/Assets/Icons/ptol.png"
Text="点线距测量" />
</StackPanel>
@@ -227,14 +225,14 @@
telerik:ScreenTip.Title="角度测量"
Command="{Binding AngleMeasureCommand}"
Size="Medium"
SmallImage="/Assets/Icons/dynamic-range.png"
SmallImage="/Assets/Icons/angle.png"
Text="角度测量" />
<telerik:RadRibbonButton
telerik:ScreenTip.Description="测量通孔填锡率"
telerik:ScreenTip.Title="通孔填锡率测量"
Command="{Binding ThroughHoleFillRateMeasureCommand}"
Size="Medium"
SmallImage="/Assets/Icons/pores.png"
SmallImage="/Assets/Icons/cylinder.png"
Text="通孔填锡率" />
</StackPanel>
@@ -367,19 +365,17 @@
</telerik:RadRibbonGroup.Variants>
<telerik:RadRibbonButton
telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
telerik:ScreenTip.Title="Add a Hyperlink"
Command="{Binding Path=ShowHyperlinkDialog.Command}"
telerik:ScreenTip.Description="自动检测BGA焊球并计算空隙率"
telerik:ScreenTip.Title="BGA检测"
Command="{Binding BgaDetectionCommand}"
Content="BGA检测"
IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
Size="Large"
SmallImage="/Assets/Icons/bga.png" />
<telerik:RadRibbonButton
telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
telerik:ScreenTip.Title="Add a Hyperlink"
Command="{Binding Path=ShowHyperlinkDialog.Command}"
telerik:ScreenTip.Description="自动检测空隙区域并计算空隙率"
telerik:ScreenTip.Title="空隙检测"
Command="{Binding VoidDetectionCommand}"
Content="孔隙检测"
IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
Size="Large"
SmallImage="/Assets/Icons/Pores.png" />
</telerik:RadRibbonGroup>
@@ -405,7 +401,6 @@
Size="Large"
SmallImage="/Assets/Icons/spiral.png" />
</telerik:RadRibbonGroup>
</telerik:RadRibbonTab>
<telerik:RadRibbonTab Header="操作">
@@ -520,8 +515,7 @@
<telerik:RadRibbonGroup.Variants>
<telerik:GroupVariant Priority="0" Variant="Large" />
</telerik:RadRibbonGroup.Variants>
<telerik:RadRibbonButton
Size="Large"
SmallImage="/Assets/Icons/message.png"
@@ -534,6 +528,7 @@
Text="关于" />
</telerik:RadRibbonGroup>
</telerik:RadRibbonTab>
</telerik:RadRibbonView>
@@ -621,4 +616,4 @@
</Grid>
</Border>
</Grid>
</Window>
</Window>