解决合并冲突：合并TURBO-596分支

2026-05-07 13:51:59 +08:00
parent 5e14fe3d9b 8d7fb4e0e3
commit 1d8db8fa2d
12 changed files with 678 additions and 245 deletions
@@ -238,15 +238,8 @@
                            Text="通孔填锡率" />
                    </StackPanel>

-                    <!--  第三列: BGA空隙测量 + 气泡测量  -->
+                    <!--  第三列: 气泡测量  -->
                    <StackPanel>
-                        <telerik:RadRibbonButton
-                            telerik:ScreenTip.Description="BGA焊球空隙率检测"
-                            telerik:ScreenTip.Title="BGA空隙测量"
-                            Command="{Binding BgaVoidMeasureCommand}"
-                            Size="Medium"
-                            SmallImage="/Assets/Icons/bga.png"
-                            Text="BGA空隙" />
                        <telerik:RadRibbonButton
                            telerik:ScreenTip.Description="手动气泡测量（魔棒+画笔）"
                            telerik:ScreenTip.Title="气泡测量"
@@ -614,7 +607,7 @@
                    FontFamily="Consolas"
                    FontSize="11"
                    Foreground="White"
-                    Text="x: 0  y: 0" />
+                    Text="{Binding CursorInfoText}" />
            </Grid>
        </Border>
    </Grid>