From d4050b421820e2e4c5e689a39b57fadadecfd226 Mon Sep 17 00:00:00 2001
From: "zhengxuan.zhang" <zhengxuan.zhang@hexagon.com>
Date: Wed, 6 May 2026 11:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4CNC=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=94=B9=E4=B8=BA=E5=86=85=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 XplorePlane/Views/Cnc/CncPageView.xaml | 103 +++++++++++++++++++++++++
 XplorePlane/Views/Main/MainWindow.xaml |  10 +--
 XplorePlane/XplorePlane.csproj         |   4 +
 3 files changed, 110 insertions(+), 7 deletions(-)

diff --git a/XplorePlane/Views/Cnc/CncPageView.xaml b/XplorePlane/Views/Cnc/CncPageView.xaml
index f25eda1..aff6580 100644
--- a/XplorePlane/Views/Cnc/CncPageView.xaml
+++ b/XplorePlane/Views/Cnc/CncPageView.xaml
@@ -96,6 +96,19 @@
             <Setter Property="FontFamily" Value="{StaticResource UiFont}" />
             <Setter Property="FontSize" Value="11" />
         </Style>
+        <Style x:Key="TreeToolbarButtonCompact" TargetType="Button" BasedOn="{StaticResource TreeToolbarButton}">
+            <Setter Property="MinWidth" Value="56" />
+            <Setter Property="Margin" Value="0,0,4,4" />
+            <Setter Property="Padding" Value="6,0" />
+            <Setter Property="FontSize" Value="10.5" />
+        </Style>
+        <Style x:Key="TreeToolbarIcon" TargetType="Image">
+            <Setter Property="Width" Value="12" />
+            <Setter Property="Height" Value="12" />
+            <Setter Property="Margin" Value="0,0,4,0" />
+            <Setter Property="Stretch" Value="Uniform" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
     </UserControl.Resources>
 
     <Border
@@ -125,6 +138,7 @@
                     Background="{StaticResource HeaderBg}"
                     BorderBrush="{StaticResource SeparatorBrush}"
                     BorderThickness="0,0,0,1">
+                    <StackPanel>
                     <WrapPanel>
                         <Button
                             Command="{Binding NewProgramCommand}"
@@ -143,6 +157,95 @@
                             Content="导出"
                             Style="{StaticResource TreeToolbarButton}" />
                     </WrapPanel>
+                    <WrapPanel Margin="0,4,0,0" Visibility="Collapsed">
+                        <Button
+                            Command="{Binding InsertReferencePointCommand}"
+                            Content="参考点"
+                            Style="{StaticResource TreeToolbarButtonCompact}" />
+                        <Button
+                            Command="{Binding InsertSavePositionCommand}"
+                            Content="添加位置"
+                            Style="{StaticResource TreeToolbarButtonCompact}" />
+                        <Button
+                            Command="{Binding InsertInspectionModuleCommand}"
+                            Content="检测模块"
+                            Style="{StaticResource TreeToolbarButtonCompact}" />
+                        <Button
+                            Command="{Binding InsertInspectionMarkerCommand}"
+                            Content="检测标记"
+                            Style="{StaticResource TreeToolbarButtonCompact}" />
+                        <Button
+                            Command="{Binding InsertPauseDialogCommand}"
+                            Content="消息弹窗"
+                            Style="{StaticResource TreeToolbarButtonCompact}" />
+                        <Button
+                            Command="{Binding InsertWaitDelayCommand}"
+                            Content="插入等待"
+                            Style="{StaticResource TreeToolbarButtonCompact}" />
+                        <Button
+                            Command="{Binding InsertCompleteProgramCommand}"
+                            Content="完成"
+                            Style="{StaticResource TreeToolbarButtonCompact}" />
+                    </WrapPanel>
+                    <WrapPanel Margin="0,4,0,0">
+                        <Button
+                            Command="{Binding InsertReferencePointCommand}"
+                            Style="{StaticResource TreeToolbarButtonCompact}">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="/Assets/Icons/reference.png" Style="{StaticResource TreeToolbarIcon}" />
+                                <TextBlock Text="参考点" />
+                            </StackPanel>
+                        </Button>
+                        <Button
+                            Command="{Binding InsertSavePositionCommand}"
+                            Style="{StaticResource TreeToolbarButtonCompact}">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="/Assets/Icons/add-pos.png" Style="{StaticResource TreeToolbarIcon}" />
+                                <TextBlock Text="添加位置" />
+                            </StackPanel>
+                        </Button>
+                        <Button
+                            Command="{Binding InsertInspectionModuleCommand}"
+                            Style="{StaticResource TreeToolbarButtonCompact}">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="/Assets/Icons/Module.png" Style="{StaticResource TreeToolbarIcon}" />
+                                <TextBlock Text="检测模块" />
+                            </StackPanel>
+                        </Button>
+                        <Button
+                            Command="{Binding InsertInspectionMarkerCommand}"
+                            Style="{StaticResource TreeToolbarButtonCompact}">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="/Assets/Icons/mark.png" Style="{StaticResource TreeToolbarIcon}" />
+                                <TextBlock Text="检测标记" />
+                            </StackPanel>
+                        </Button>
+                        <Button
+                            Command="{Binding InsertPauseDialogCommand}"
+                            Style="{StaticResource TreeToolbarButtonCompact}">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="/Assets/Icons/message.png" Style="{StaticResource TreeToolbarIcon}" />
+                                <TextBlock Text="消息弹窗" />
+                            </StackPanel>
+                        </Button>
+                        <Button
+                            Command="{Binding InsertWaitDelayCommand}"
+                            Style="{StaticResource TreeToolbarButtonCompact}">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="/Assets/Icons/wait.png" Style="{StaticResource TreeToolbarIcon}" />
+                                <TextBlock Text="插入等待" />
+                            </StackPanel>
+                        </Button>
+                        <Button
+                            Command="{Binding InsertCompleteProgramCommand}"
+                            Style="{StaticResource TreeToolbarButtonCompact}">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="/Assets/Icons/finish.png" Style="{StaticResource TreeToolbarIcon}" />
+                                <TextBlock Text="完成" />
+                            </StackPanel>
+                        </Button>
+                    </WrapPanel>
+                    </StackPanel>
                 </Border>
 
                 <TreeView
diff --git a/XplorePlane/Views/Main/MainWindow.xaml b/XplorePlane/Views/Main/MainWindow.xaml
index ab8bf06..628b1d3 100644
--- a/XplorePlane/Views/Main/MainWindow.xaml
+++ b/XplorePlane/Views/Main/MainWindow.xaml
@@ -279,7 +279,7 @@
                         Size="Large"
                         SmallImage="/Assets/Icons/cnc.png"
                         Text="CNC 编辑" />
-
+<!--
                     <StackPanel>
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Title="参考点"
@@ -313,12 +313,7 @@
                             Command="{Binding InsertInspectionModuleCommand}"
                             SmallImage="/Assets/Icons/Module.png"
                             Text="检测模块" />
-                        <telerik:RadRibbonButton
-                            telerik:ScreenTip.Title="全部保存"
-                            Size="Medium"
-                            Command="{Binding SaveCncProgramCommand}"
-                            SmallImage="/Assets/Icons/saveall.png"
-                            Text="全部保存" />
+               
                     </StackPanel>
                     <StackPanel>
                         <telerik:RadRibbonButton
@@ -334,6 +329,7 @@
                             SmallImage="/Assets/Icons/wait.png"
                             Text="插入等待" />
                     </StackPanel>
+                    -->
 
                     <telerik:RadRibbonButton
                         telerik:ScreenTip.Description="打开矩阵编排窗口，配置多工件阵列检测方案"
diff --git a/XplorePlane/XplorePlane.csproj b/XplorePlane/XplorePlane.csproj
index 87a793a..0cf68a2 100644
--- a/XplorePlane/XplorePlane.csproj
+++ b/XplorePlane/XplorePlane.csproj
@@ -150,6 +150,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>Libs\Hardware\zh-TW\%(Filename)%(Extension)</Link>
     </None>
+    <Compile Remove="Views\Hardware\**" />
+    <EmbeddedResource Remove="Views\Hardware\**" />
+    <None Remove="Views\Hardware\**" />
+    <Page Remove="Views\Hardware\**" />
     <Compile Remove="Views\ImageProcessing\ImageProcessingPanelView.xaml.cs" />
     <Compile Remove="Views\ImageProcessing\ImageProcessingWindow.xaml.cs" />
     <Compile Remove="Views\ImageProcessing\PipelineEditorWindow.xaml.cs" />