From b87480a30f8818784645e11ab3170fceb6653d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F?= <wei.lw.li@hexagon.com>
Date: Wed, 29 Apr 2026 09:30:24 +0800
Subject: [PATCH] =?UTF-8?q?BGA=E8=87=AA=E5=8A=A8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7:BGA=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E4=BB=A5=E5=8D=8A=E9=80=8F=E6=98=8E=E5=9B=BE=E5=B1=82=E5=8F=A0?=
 =?UTF-8?q?=E5=8A=A0=E5=9C=A8canvas=E4=B8=8A=E3=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controls/PolygonRoiCanvas.xaml.cs         |  16 +++
 XplorePlane/Assets/Icons/ok.png               | Bin 0 -> 390 bytes
 XplorePlane/Assets/Icons/run32.png            | Bin 0 -> 608 bytes
 .../ImageProcessing/BgaDetectionViewModel.cs  |  43 ++++++-
 .../ImageProcessing/BgaDetectionPanel.xaml    | 112 ++++++++++++------
 5 files changed, 131 insertions(+), 40 deletions(-)
 create mode 100644 XplorePlane/Assets/Icons/ok.png
 create mode 100644 XplorePlane/Assets/Icons/run32.png

diff --git a/XP.ImageProcessing.RoiControl/Controls/PolygonRoiCanvas.xaml.cs b/XP.ImageProcessing.RoiControl/Controls/PolygonRoiCanvas.xaml.cs
index 2473333..8c1d4b3 100644
--- a/XP.ImageProcessing.RoiControl/Controls/PolygonRoiCanvas.xaml.cs
+++ b/XP.ImageProcessing.RoiControl/Controls/PolygonRoiCanvas.xaml.cs
@@ -477,9 +477,25 @@ namespace XP.ImageProcessing.RoiControl.Controls
             _bubbleRoiResizing = false; _bubbleBrushDragging = false;
             _bubbleTool = BubbleSubTool.Roi;
             _bubbleUndoStack.Clear();
+            // 清理外部叠加的结果图层（IsHitTestVisible=false 的 Image，排除背景图）
+            var toRemove = new System.Collections.Generic.List<UIElement>();
+            foreach (UIElement child in mainCanvas.Children)
+            {
+                if (child is Image img && img != backgroundImage && !img.IsHitTestVisible)
+                    toRemove.Add(child);
+            }
+            foreach (var el in toRemove)
+                mainCanvas.Children.Remove(el);
         }
 
         public void ClearMeasurements() => RemoveMeasureOverlay();
+
+        /// <summary>从 mainCanvas 移除指定的 UI 元素（用于外部叠加层清理）</summary>
+        public void RemoveFromCanvas(System.Windows.UIElement element)
+        {
+            if (element != null && mainCanvas.Children.Contains(element))
+                mainCanvas.Children.Remove(element);
+        }
         public int MeasureCount => _ppGroups.Count + _ptlGroups.Count + _angleGroups.Count + _frGroups.Count + _bgaGroups.Count;
 
         // ── 点击分发 ──
diff --git a/XplorePlane/Assets/Icons/ok.png b/XplorePlane/Assets/Icons/ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..6794418e0c6dbf990add9073c9c3eb79323a5291
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003yNkl<ZcmeE|
z%@Kky5JrPEf;SEnft6`zSOm;)q!Zi^fmxOi5|iKo7<SChZr&pj$D8`|bqSnr2l716
z_-l9Q4irUErD<AmiNgc{rzbCyB+0nMAp#RzjTe`QE+FBfgCdEpZQCxYz!sb&-gR9+
z=u<@#uz^Ptu!TnvaDlG`P)zZ}#4ka$71fm#@}9qQIWfNjtoTK3X9=othC^l$&=fmK
zXzH;xV)Mx{i5LX>zF+)4V}im;!Us-_?=fte=1vkF21FPoeBodXJAj6(L<l&zvj94_
z5~1K=E(9>JClL}3-bw(2CJCB%I_H#cytM+TFi2pU$L>+%$+EpEfJ6%kFE|)R0VEhC
zyx~}XR{%*Gi6C&SZ6$z2CJ_vdb*%-E42kKV4EiC$NgxDJu5k%O-vPPhvi|`90RR6$
k4Sdc3000I_L_t&o0F1J_LCD5`rvLx|07*qoM6N<$g8WaFp#T5?

literal 0
HcmV?d00001

diff --git a/XplorePlane/Assets/Icons/run32.png b/XplorePlane/Assets/Icons/run32.png
new file mode 100644
index 0000000000000000000000000000000000000000..e14143b0f5cef8048f63e214a007beb8bccfae3a
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006NNkl<Zcmd3o
zZ<4_<7{+xu2;a=$4xD5;i8_higgaoyHx9zs-;-%FR8wt}&f3W<NmZWT`zOi%^#1wp
zdjZDd@o+kwt|ybpMSWL+@<yQF@2?R}lO!3c7l@!3M{QmJgqOL}UOn?6P`lXC@B&CQ
zx6SQ#8$BM6s~~umDjI;y83(sI0KN11e7)cA3)E7qClG+PKqyUm)Y@tRXmvpxkH_fI
zs0|<pnLvus;CbuXXbgauNr{aHb5o@Bwl*52r4;~TrYRZ}=!%J}4UH+%ZQU&!1b|p+
zG$_(#-7OmoAPAYFL0VpR3eQt^%C0IJ(Et!L4G6PSn3%NC&#R&l9RNX>7E-a|yl@8?
z(ReG+P5=ZUI~)$#^Ogn19`E|vSf>C+fe(arp_vnu=}YSrfRN7zgTaMVSkG-;IEYRF
zRP~7OP?6D@ma0I_=;<Rmz-%^K%4;<2ZMjD{!8Sa5YtaC#*W`OE75Xc^yw=&ku)IY9
zAl&Ps*Qe8I<n#I&B?!QJ&4Q-5a<3N%S9;C+uC)dzdX0FNdu?w=CsH+N4B+z`aovhl
zTBYAL0w{XTiYda%btA9&oolrK<TZEvg<lnOUAnb+uXg(gKyH6k;hbjXIA!HvuUW%2
zF95=s-a^<Mqs+ChRpG&2Yh7zz0B*4jq8TRPs9sxf^<Dt|heLs_Fcn!;uO)2F3t(Re
u?LYng4*&rF|2fvLYXATM21!IgR09B|T@p~cEFPTz0000<MNUMnLSTZ&W)Fw}

literal 0
HcmV?d00001

diff --git a/XplorePlane/ViewModels/ImageProcessing/BgaDetectionViewModel.cs b/XplorePlane/ViewModels/ImageProcessing/BgaDetectionViewModel.cs
index 2db8a1e..d4870bc 100644
--- a/XplorePlane/ViewModels/ImageProcessing/BgaDetectionViewModel.cs
+++ b/XplorePlane/ViewModels/ImageProcessing/BgaDetectionViewModel.cs
@@ -94,6 +94,7 @@ namespace XplorePlane.ViewModels.ImageProcessing
 
         private PolygonRoiCanvas _canvas;
         private PolygonROI _roiShape;
+        private System.Windows.Controls.Image _resultOverlayImage;
 
         public void SetCanvas(PolygonRoiCanvas canvas)
         {
@@ -215,6 +216,43 @@ namespace XplorePlane.ViewModels.ImageProcessing
                 }
                 _canvas.SelectedROI = null;
             }
+            // 关闭面板时不清除结果叠加层，保留显示
+        }
+
+        private void ShowResultOnOverlay(BitmapSource resultBmp)
+        {
+            if (_canvas == null || resultBmp == null) return;
+
+            // 移除旧的结果图层
+            RemoveResultOverlay();
+
+            // 创建新的结果图层叠加到 canvas 上（插入到背景图之后、ROI之前）
+            _resultOverlayImage = new System.Windows.Controls.Image
+            {
+                Source = resultBmp,
+                IsHitTestVisible = false,
+                Opacity = 0.85,
+                Stretch = System.Windows.Media.Stretch.Fill
+            };
+            _resultOverlayImage.SetBinding(System.Windows.FrameworkElement.WidthProperty,
+                new System.Windows.Data.Binding("CanvasWidth") { Source = _canvas });
+            _resultOverlayImage.SetBinding(System.Windows.FrameworkElement.HeightProperty,
+                new System.Windows.Data.Binding("CanvasHeight") { Source = _canvas });
+
+            var mainCanvas = _canvas.FindName("mainCanvas") as System.Windows.Controls.Canvas;
+            if (mainCanvas != null)
+            {
+                // 插入到索引1（背景图是索引0），这样ROI和测量overlay在上面
+                int insertIndex = Math.Min(1, mainCanvas.Children.Count);
+                mainCanvas.Children.Insert(insertIndex, _resultOverlayImage);
+            }
+        }
+
+        public void RemoveResultOverlay()
+        {
+            if (_resultOverlayImage == null || _canvas == null) return;
+            _canvas.RemoveFromCanvas(_resultOverlayImage);
+            _resultOverlayImage = null;
         }
 
         private string _resultText = "结果: --";
@@ -311,9 +349,8 @@ namespace XplorePlane.ViewModels.ImageProcessing
                 // 绘制结果到图像
                 ResultImage = RenderResults(grayImage, output);
 
-                // 将结果图像推送到主界面显示
-                if (ResultImage != null)
-                    _viewportService?.SetManualImage(ResultImage, "BGA检测结果");
+                // 将结果叠加到 canvas overlay 上
+                ShowResultOnOverlay(ResultImage);
 
                 grayImage.Dispose();
             }
diff --git a/XplorePlane/Views/ImageProcessing/BgaDetectionPanel.xaml b/XplorePlane/Views/ImageProcessing/BgaDetectionPanel.xaml
index a2b6593..fb03f81 100644
--- a/XplorePlane/Views/ImageProcessing/BgaDetectionPanel.xaml
+++ b/XplorePlane/Views/ImageProcessing/BgaDetectionPanel.xaml
@@ -14,39 +14,81 @@
         <!-- 左侧：参数面板 -->
         <ScrollViewer Grid.Column="0" VerticalScrollBarVisibility="Auto">
             <StackPanel Margin="10">
-                <ToggleButton IsChecked="{Binding RoiEnabled}" Margin="0,0,0,6" Padding="8,4" Cursor="Hand" ToolTip="启用ROI区域">
-                    <ToggleButton.Style>
-                        <Style TargetType="ToggleButton">
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="ToggleButton">
-                                        <Border x:Name="Bd" Background="#EEEEEE" BorderBrush="#CCCCCC"
-                                                BorderThickness="1" CornerRadius="3" Padding="10,4">
-                                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                        </Border>
-                                        <ControlTemplate.Triggers>
-                                            <Trigger Property="IsChecked" Value="True">
-                                                <Setter TargetName="Bd" Property="Background" Value="#0078D7" />
-                                                <Setter TargetName="Bd" Property="BorderBrush" Value="#005A9E" />
-                                            </Trigger>
-                                            <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter TargetName="Bd" Property="Background" Value="#DDDDDD" />
-                                            </Trigger>
-                                            <MultiTrigger>
-                                                <MultiTrigger.Conditions>
-                                                    <Condition Property="IsMouseOver" Value="True" />
-                                                    <Condition Property="IsChecked" Value="True" />
-                                                </MultiTrigger.Conditions>
-                                                <Setter TargetName="Bd" Property="Background" Value="#006CBE" />
-                                            </MultiTrigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </ToggleButton.Style>
-                    <Image Source="/Assets/Icons/polygon.png" Width="20" Height="20" />
-                </ToggleButton>
+                <WrapPanel Margin="0,0,0,6">
+                    <ToggleButton IsChecked="{Binding RoiEnabled}" Padding="8,4" Margin="0,0,6,0" Cursor="Hand" ToolTip="启用ROI区域">
+                        <ToggleButton.Style>
+                            <Style TargetType="ToggleButton">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="ToggleButton">
+                                            <Border x:Name="Bd" Background="#EEEEEE" BorderBrush="#CCCCCC"
+                                                    BorderThickness="1" CornerRadius="3" Padding="10,4">
+                                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsChecked" Value="True">
+                                                    <Setter TargetName="Bd" Property="Background" Value="#0078D7" />
+                                                    <Setter TargetName="Bd" Property="BorderBrush" Value="#005A9E" />
+                                                </Trigger>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="Bd" Property="Background" Value="#DDDDDD" />
+                                                </Trigger>
+                                                <MultiTrigger>
+                                                    <MultiTrigger.Conditions>
+                                                        <Condition Property="IsMouseOver" Value="True" />
+                                                        <Condition Property="IsChecked" Value="True" />
+                                                    </MultiTrigger.Conditions>
+                                                    <Setter TargetName="Bd" Property="Background" Value="#006CBE" />
+                                                </MultiTrigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </ToggleButton.Style>
+                        <Image Source="/Assets/Icons/polygon.png" Width="20" Height="20" />
+                    </ToggleButton>
+                    <Button Padding="8,4" Margin="0,0,6,0" Command="{Binding ExecuteCommand}" ToolTip="执行检测" Cursor="Hand">
+                        <Button.Template>
+                            <ControlTemplate TargetType="Button">
+                                <Border x:Name="Bd" Background="#EEEEEE" BorderBrush="#CCCCCC"
+                                        BorderThickness="1" CornerRadius="3" Padding="10,4">
+                                    <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                </Border>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="Bd" Property="Background" Value="#DDDDDD" />
+                                    </Trigger>
+                                    <Trigger Property="IsPressed" Value="True">
+                                        <Setter TargetName="Bd" Property="Background" Value="#0078D7" />
+                                        <Setter TargetName="Bd" Property="BorderBrush" Value="#005A9E" />
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Button.Template>
+                        <Image Source="/Assets/Icons/run32.png" Width="20" Height="20" />
+                    </Button>
+                    <Button Padding="8,4" Click="Close_Click" ToolTip="关闭" Cursor="Hand">
+                        <Button.Template>
+                            <ControlTemplate TargetType="Button">
+                                <Border x:Name="Bd" Background="#EEEEEE" BorderBrush="#CCCCCC"
+                                        BorderThickness="1" CornerRadius="3" Padding="10,4">
+                                    <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                </Border>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="Bd" Property="Background" Value="#DDDDDD" />
+                                    </Trigger>
+                                    <Trigger Property="IsPressed" Value="True">
+                                        <Setter TargetName="Bd" Property="Background" Value="#0078D7" />
+                                        <Setter TargetName="Bd" Property="BorderBrush" Value="#005A9E" />
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Button.Template>
+                        <Image Source="/Assets/Icons/ok.png" Width="20" Height="20" />
+                    </Button>
+                </WrapPanel>
                 <TextBlock Text="BGA定位参数" FontWeight="SemiBold" Margin="0,0,0,6" />
                 <TextBlock Text="焊球最小面积" FontSize="11" Margin="0,0,0,2" />
                 <DockPanel Margin="0,0,0,6">
@@ -97,10 +139,6 @@
                 </DockPanel>
                 <Separator Margin="0,4" />
                 <TextBlock Text="{Binding ResultText}" FontSize="14" FontWeight="SemiBold" Margin="0,4,0,8" />
-                <WrapPanel HorizontalAlignment="Center">
-                    <Button Content="执行检测" Padding="16,6" Margin="0,0,8,0" Command="{Binding ExecuteCommand}" />
-                    <Button Content="关闭" Padding="16,6" Click="Close_Click" />
-                </WrapPanel>
             </StackPanel>
         </ScrollViewer>