From 1822e159089eeedf8164022413761f34a663ba80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F?= <wei.lw.li@hexagon.com>
Date: Tue, 28 Apr 2026 14:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=94=E6=B3=A1=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=95=8C=E9=9D=A2=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 XplorePlane/Assets/Icons/Clear.png            | Bin 0 -> 1059 bytes
 XplorePlane/Assets/Icons/Undo.png             | Bin 0 -> 442 bytes
 XplorePlane/Assets/Icons/brush32.png          | Bin 0 -> 609 bytes
 XplorePlane/Assets/Icons/eraser32.png         | Bin 0 -> 697 bytes
 XplorePlane/Assets/Icons/magic32.png          | Bin 0 -> 516 bytes
 XplorePlane/Assets/Icons/rectangle32.png      | Bin 0 -> 209 bytes
 .../ImageProcessing/BubbleMeasurePanel.xaml   |  38 ++++++++++++------
 .../BubbleMeasurePanel.xaml.cs                |  13 ++++++
 8 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 XplorePlane/Assets/Icons/Clear.png
 create mode 100644 XplorePlane/Assets/Icons/Undo.png
 create mode 100644 XplorePlane/Assets/Icons/brush32.png
 create mode 100644 XplorePlane/Assets/Icons/eraser32.png
 create mode 100644 XplorePlane/Assets/Icons/magic32.png
 create mode 100644 XplorePlane/Assets/Icons/rectangle32.png

diff --git a/XplorePlane/Assets/Icons/Clear.png b/XplorePlane/Assets/Icons/Clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..285eeae277c9b9dcec94689d77a3f85335de29e8
GIT binary patch
literal 1059
zcmV+;1l;?HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BnNkl<Zcmc$g
zKWG#|6vj7~D-H`gtt?InAxCmSyjCzlOA!kV22>*2S!gU$n8FAuT4`mc7m36_2>t=F
zP)I-<6%~>T7b1AE3u0p@BqaX6$<DI7H+#2tf`)mSnfJbV-#0UFcQ51p=f8g<pr@xN
zFLUj+Edl-g{d-)=T)w`(zJY8uTf?d@5iJWK;kWhm^-uIuF2b-6%mDKlOfA>h**Oyz
z(UJfXD%nnD!;Uk*Lho$E0`iTGjVFL+J32b@aS^EnkWl1G>hX6QQya%$Cjy^v!h4WU
zE-Wk@U0Yi_#R4OO>-fspv{V8}sANj2MT3<}<t)3opa~Wc0aiHSExCxj#l^*C#QX%W
zmhJBD-m5`V0mWjm22e@qJdw|8Fh4(kGcF>DT=?GJ-ZJ<j8e@Y?OH1$Qy@movID_iE
zfGnP5=Z0K!SzH9Zx}D?meDV>Ev0xL7lLd$zfZe%{a|GWde32FtA>0&qZjN2RM&yb+
zPXHqA#F7sJoWRs3h&e?NyoTL}{3N|;&Bz6+697SkT*r=G2Ha2tm~rd`IMdRQ3m6gL
zA{R(T@}?q$lTo<WsTt>;D;~B$0E=oATyX3VMhZ@g@TC&Ln{q{X-}d>vvoiuXuJe%R
zQLQ2xg(x6L*nzIDuB~=8v8E!ZgInMmUKw%Ii~ucw{F(81-Z`$qoCM_42z#B&<;MJ&
z>C%WugHbXgK!erQ)lvEhgybPDL;i+-7@wEPWIm`5TN;8im_UGDmAtR-L1IPhXY3*9
z@Z8+o3yo#^njy{<SQ>&jhPBhmV=WLMM@Ym+&9NVx!Y_K$M9zn#jIV63DNcaD?mZz4
z8+o84tQ{^C3c>G*hyVe65krhsMB7<l$SgVj0es6O4GNWU!@{J<53$BvC+ojgtJTl+
zrqv0M*B2372fitG{*>O3Q?&Ls0j|xKBtqou{`n@#dkD^aTl{(Qw;(J6@D6M@yI66N
z6EltEk(1DU$H?s|7`*;DPe1`#NQ6D^-`ufzL=|T|1j&t3skB9NSy%*uEunU9$ASgc
zP=HXr2z}k`(_w0Yqdi9a5hP<g!X?H*!}rBbH~}<OoaDkZ6(Eo=B3u)XNo=Z`_+1{;
zxAdkV>=3cw&iPyyO(5Z4Dgjy>7QuWQrq}i>ws%@%S)80$;?9Mar4}Ht6~PYQYmODD
z15*?2kh4DdDNxX562YD8{=+qK5mCXhr`fs9-O>rzMG_HyZR5X+sU=psf-Y-IfD(m7
zywsc%sI{_lt&z1YK#L^;(u0i8Q0=?uTW)_Pz_KCYjvdGQX7fJ)00960ZgkDo00006
dNkl<Z0|0HRE?-*`*-rof002ovPDHLkV1i0J<HY~~

literal 0
HcmV?d00001

diff --git a/XplorePlane/Assets/Icons/Undo.png b/XplorePlane/Assets/Icons/Undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a81bd7d488a10684710e50af5ecba5e167a09520
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004RNkl<ZcmeE`
z0ggm47=>%YJ=|mo61Nz06MGWo781nX#2!T0_k@Y<sHqt;*@;OXt!ewd{{7nz@#5bB
za75t$MIZ=*C=5e;tHZM@0>1B8UDqW|)10<~&<3D6R_#D6F&|q<3qUfbubXAr4=c~=
zE`V%~El3T+u$c=gVT_}@MT-EKsKN@zu%jvj%p*V~OA<m<$dlUhyqb_pFiL<qb4<Ld
z0M;fbU=kI?EC4%W@C7<QDv-u7AM?Zk#0lSS$}9jAEYI`w85KqGWm%Rxfrz;sGQli>
z-09Ia7czxt+xAnQYgYi85rS_D+j(<??hY^*_ql-Wcnts`{v2hruVwcLOcM`VkY1gK
z%B}!3N7$3WOPHp48SCR)3xE^hR!df@o|?ljo+c#PebEBo@j>{am6|48%zL4Clpb0D
z(ip8KR-aPn?5fQ1pU?s*%kqp#j5XpI3S+)$q>>hZYVa1{4}c>A?;nACC*>Ca0RR8}
kTI0t6000I_L_t&o0GetGP^mzyX8-^I07*qoM6N<$f@Vg!jsO4v

literal 0
HcmV?d00001

diff --git a/XplorePlane/Assets/Icons/brush32.png b/XplorePlane/Assets/Icons/brush32.png
new file mode 100644
index 0000000000000000000000000000000000000000..39ca1d6dd9388e41d8ae05a16c9ff494c2b8c204
GIT binary patch
literal 609
zcmV-n0-pVeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006ONkl<Zcmc$g
zU2eiK5QIzN9;I(cz#ZTug_Dq;1UL!Y0g!lWdJiP}4a634;%owmioC>j);qJ~pZNXl
zpMRYam`<mQ$z(FC%CR#7<MDWXy<XRV??i-WY3YQ3vhMYI3x^1i4_6PLtrHlHMngb$
zm@km|^^Ks?I)TApAlW?(*{6rYVdFc3N~;8rentG;q9gk#IKFSK5dd7kiGn`b<#O3R
zw!?ZW1T^nRos(Wb^rh$XIaNJotq{<>BefP^4u`%<`Q`jFfozXUe#P^q?2pIex9^Bl
zULp{aURZUqm)}bSB)x)^nYH-bn5PM_>I+-W1(p2P;&Z-F5dd6sUf6OjXkGc`-<W{r
zoq@TdmUgbxS$u9lV*=T{?+LJ%)I7ryRVH*)yD<S4*HT87^V8|{Ns#1`2=YfiJopw$
zZ34{uif{Z63fxR}Yz>($pi7aEReg90=ycQ~ARv4bfc$BvI=1Nd`#VUa)HgEx8WocO
zna>F9FBf5S-VHMnTc*W4`NHug0c8CO2Ze2sU~0TN;rpt#Nr1uH^E|4HNK|{2zcmTe
z4UAIJdtW*9z1JjgceDRlh?N(QScFyxkiB{F=!}5CnWkk7!0I;@5I|XwtUu9d$oA9G
zT;^u>nFPr0cBgZIM4SWI%YYm2d&cLANg(syJ3zpn&Nhpcdzb`JKquThH>$;kNucS+
vCFEwc{{R30|Nl2M1R($b00v1!K~w_(e`3l({-cU000000NkvXXu0mjfet{lP

literal 0
HcmV?d00001

diff --git a/XplorePlane/Assets/Icons/eraser32.png b/XplorePlane/Assets/Icons/eraser32.png
new file mode 100644
index 0000000000000000000000000000000000000000..651e27e296f5004f64c4a5a8e94e7bb7a9f6118f
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007RNkl<Zcmc$g
zjd6l77=~*dq_}~n4q!LINve~SO>_YD+@LO^_I)^#3n2*sdRLD~2;a~1{Upcx+duy%
z0c<v#?Q*#+ro=EBV7*=+U$573KA#^~tJT+7h*1D?Sjyp6gR7X$W_tnsXnioqC;&P9
z#<Mpp2&M7fMIQ$PDAJH~*FiyPkjv?hK>$r;q~CQIo0mELF$h4B4Xv>)ORPV#0h;Jd
z<He$mty>UZAR9o@_toCF9eOU5iB<`-0Hj3fCmlG3=J|Y{%$$1`fVSNp;XfGF?RLAn
zc6tHWPOid~`Q!08`1(nJrtw-e^9|%atB3Y}^ynr5q(tqJn>y~->$MX-Mxy{~JR%>v
z?XYc!dT3`Kyh#+G>DJ1VAM<!RpU<t%ca1~=ntHMIP-eJ#*>go7OuaD>1!x*@ive}-
zPW`}EY;7T9Byq1&(W4gykV6`<P9NEzi3IYgbwJSV9hb``T6?1$1TYOKhb;pR$U+8^
z{UOknuH=JP5I|}FmVw~D#R?!qC%I2OhswgXO9D!-zB&Nr<Rj&^MB<P7Doa4LoCz!|
zdQ5i!v{)+oYy)INI_#Fa^yrVeZ?u+mg#b|e;4f!5yJbh#R2njpqgu;^08UC_sYYZM
z)IzC0MUC8`s9k#<0M(Q|UkRfA)NUelb?jV_^>HoP<Y8kK0+S8^H6@h-VXINsBaIpQ
z!j)s9?>%e+e(h2Rz`Oy3dMd><<ktVf1xm7oWO%RXxGM@^%qbg{vcU;x%OdALdS5C7
zgBngcovRlB4YDDSgFqI_$Uy_B1?K?or;IEB<DdblfMIUdQ}@1izW@LL|Nq{FwTl1%
f00v1!K~w_(G}0?jT0Kcy00000NkvXXu0mjfHNZ9a

literal 0
HcmV?d00001

diff --git a/XplorePlane/Assets/Icons/magic32.png b/XplorePlane/Assets/Icons/magic32.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ebc7c191c15e10e26d33ff3c1c02f1d3204b454
GIT binary patch
literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005GNkl<ZcmdRw
z;cbI35QPKDAn89OV25;*WRfV8kWJbh0EvHL5uo=FMpxJIohh^m;$$$-?>^hu5byr^
zczu8@%Lc^KfqeZDkb0gZ$<e0~M<CDhbDE|P$;g!iZ4QS+K~r>fJx84g(D(f{ilXCw
zzyE;YPI*9!<Rm{0!*Hh3d5QpC*S(WL8v<b^Z|k~#b7rSX5uj<B)(25lRfHg~@eE0h
z1|k4N90K<=wB8qsM(jx8?Kyl9DgX!#1Wm<-di;qxR~Vgd*m*lO02;yEmmC@dbSO0u
z1fVet)i?oY-HzL<U51+5?ae*+aRP9`*4It|n&)w8*<~n<-QL`DA1448Y<(RBfK3J=
zK|zC%ba<`?fFW%_h4f9BbPq{~<OmhOWLi*z6U9zi=hy{l!%}^~L;#)~#`X?pFD=0N
zz8&ZQ4=;d}oE!0L7X*LKub%=eO>WFNL>$LAQ*W0}fZrxJNdSQ<E6eh3>g@6dz*@=e
zM9=QO0sM7xK+OP4le@N87;9q&pp656uK0me{mEz(NV*w-*6xkg`5iBf)M(A;Gr;u5
zUe+|%c+CJB@fMoR0VL=z00030|IycsyZ`_I21!IgR09Cfl`~LGQu|E+0000<MNUMn
GLSTZXmfcza

literal 0
HcmV?d00001

diff --git a/XplorePlane/Assets/Icons/rectangle32.png b/XplorePlane/Assets/Icons/rectangle32.png
new file mode 100644
index 0000000000000000000000000000000000000000..6eaed6cd8455bfe5b8f5ab8cf1f016dcd9303dc1
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJHcuDFkP5~((=Kv081T4U^^|dS
zFElp4=quy;-reABV7*Y(si`8f3S^EimY>;n%AIkRO2LEZJC5I*)@!;Y7;@cD^Lrc7
z5N`bFVP)d<a7~AGd^0o}I6C0Sp|jz8nvb}ZSi*9z`44B_+Q1;~GVk_>>)EZ_HN_5a
wESmj~`Hx@?&>{c-@1DDRCy>DgauGAb^67exQ{v|I0!0`+UHx3vIVCg!0K<$-U;qFB

literal 0
HcmV?d00001

diff --git a/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml b/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml
index 46f1700..07d443a 100644
--- a/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml
+++ b/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml
@@ -43,14 +43,22 @@
         <!-- 工具选择 -->
         <TextBlock Text="工具" FontWeight="SemiBold" Margin="0,0,0,4" />
         <WrapPanel>
-            <RadioButton x:Name="RbRoi" Content="ROI" IsChecked="True" Margin="0,0,4,4"
-                         Style="{StaticResource ToolToggleStyle}" />
-            <RadioButton x:Name="RbWand" Content="魔棒" Margin="0,0,4,4"
-                         Style="{StaticResource ToolToggleStyle}" />
-            <RadioButton x:Name="RbBrush" Content="画笔" Margin="0,0,4,4"
-                         Style="{StaticResource ToolToggleStyle}" />
-            <RadioButton x:Name="RbEraser" Content="橡皮擦" Margin="0,0,0,4"
-                         Style="{StaticResource ToolToggleStyle}" />
+            <RadioButton x:Name="RbRoi" IsChecked="True" Margin="0,0,4,4"
+                         ToolTip="ROI" Style="{StaticResource ToolToggleStyle}">
+                <Image Source="/Assets/Icons/rectangle32.png" Width="20" Height="20" />
+            </RadioButton>
+            <RadioButton x:Name="RbWand" Margin="0,0,4,4"
+                         ToolTip="魔棒" Style="{StaticResource ToolToggleStyle}">
+                <Image Source="/Assets/Icons/magic32.png" Width="20" Height="20" />
+            </RadioButton>
+            <RadioButton x:Name="RbBrush" Margin="0,0,4,4"
+                         ToolTip="画笔" Style="{StaticResource ToolToggleStyle}">
+                <Image Source="/Assets/Icons/brush32.png" Width="20" Height="20" />
+            </RadioButton>
+            <RadioButton x:Name="RbEraser" Margin="0,0,0,4"
+                         ToolTip="橡皮擦" Style="{StaticResource ToolToggleStyle}">
+                <Image Source="/Assets/Icons/eraser32.png" Width="20" Height="20" />
+            </RadioButton>
         </WrapPanel>
 
         <Separator Margin="0,6" />
@@ -58,9 +66,9 @@
         <!-- 阈值 -->
         <TextBlock Text="灰度阈值（与点击点的最大灰度差）" Margin="0,0,0,4" FontSize="11" Foreground="Gray" />
         <DockPanel>
-            <TextBox x:Name="TbThreshold" DockPanel.Dock="Right" Width="45" Text="128"
+            <TextBox x:Name="TbThreshold" DockPanel.Dock="Right" Width="45" Text="30"
                      VerticalContentAlignment="Center" Margin="6,0,0,0" />
-            <Slider x:Name="SliderThreshold" Minimum="0" Maximum="255" Value="128"
+            <Slider x:Name="SliderThreshold" Minimum="0" Maximum="60" Value="30"
                     VerticalAlignment="Center" />
         </DockPanel>
 
@@ -86,9 +94,13 @@
 
         <!-- 操作按钮 -->
         <WrapPanel HorizontalAlignment="Center">
-            <Button Content="撤销" Padding="12,4" Margin="0,0,8,0" Click="Undo_Click" />
-            <Button Content="清除标记" Padding="12,4" Margin="0,0,8,0" Click="ClearMask_Click" />
-            <Button Content="完成" Padding="12,4" Click="Finish_Click" />
+            <Button Padding="8,4" Margin="0,0,8,0" ToolTip="撤销" Click="Undo_Click">
+                <Image Source="/Assets/Icons/Undo.png" Width="20" Height="20" />
+            </Button>
+            <Button Padding="8,4" Margin="0,0,8,0" ToolTip="清除标记" Click="ClearMask_Click">
+                <Image Source="/Assets/Icons/Clear.png" Width="20" Height="20" />
+            </Button>
+            <Button Content="OK" Padding="12,4" Click="Finish_Click" />
         </WrapPanel>
     </StackPanel>
 </Window>
diff --git a/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml.cs b/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml.cs
index 58ba847..8169eac 100644
--- a/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml.cs
+++ b/XplorePlane/Views/ImageProcessing/BubbleMeasurePanel.xaml.cs
@@ -48,6 +48,19 @@ namespace XplorePlane.Views.ImageProcessing
                 _canvas?.SetBubbleBrushSize((int)SliderBrushSize.Value);
             };
 
+            // VoidLimit 同步
+            TbVoidLimit.TextChanged += (s, ev) =>
+            {
+                if (double.TryParse(TbVoidLimit.Text, out double val))
+                    _canvas?.SetBubbleVoidLimit(System.Math.Clamp(val, 0, 100));
+            };
+
+            // 初始同步：确保面板默认值推送到 canvas
+            _canvas?.SetBubbleThreshold((int)SliderThreshold.Value);
+            _canvas?.SetBubbleBrushSize((int)SliderBrushSize.Value);
+            if (double.TryParse(TbVoidLimit.Text, out double initLimit))
+                _canvas?.SetBubbleVoidLimit(System.Math.Clamp(initLimit, 0, 100));
+
             // 监听 canvas 的工具切换事件（ROI 画完后自动切换时同步面板）
             if (_canvas != null)
             {