#0046 将telerik 升级到 2024.1.408.310；调整界面和主题；引入 硬件层依赖

XplorePlane/App.xaml

@@ -5,14 +5,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!-- Telerik Office2013 主题 (NoXaml 版本必须手动加载) -->
+                <!-- NetCore (Xaml-included) 版本已内置主题，无需手动加载 -->
-                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2013;component/Themes/System.Windows.xaml"/>
-                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2013;component/Themes/Telerik.Windows.Controls.xaml"/>
-                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2013;component/Themes/Telerik.Windows.Controls.Input.xaml"/>
-                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2013;component/Themes/Telerik.Windows.Controls.Navigation.xaml"/>
-                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2013;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>
-                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2013;component/Themes/Telerik.Windows.Controls.RibbonView.xaml"/>
-                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2013;component/Themes/Telerik.Windows.Controls.Data.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

XplorePlane/App.xaml.cs

@@ -3,6 +3,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using System.Windows;
+using Telerik.Windows.Controls;
 using XplorePlane.Views;
 using XplorePlane.ViewModels;
 using XplorePlane.Services;
@@ -25,6 +26,9 @@ namespace XplorePlane
     {
         protected override void OnStartup(StartupEventArgs e)
         {
+            // 设置 Telerik Fluent 主题
+            StyleManager.ApplicationTheme = new Windows11Theme();
+
             // 强制使用中文 UI，确保 ImageProcessing 库显示中文
             var zhCN = new CultureInfo("zh-CN");
             Thread.CurrentThread.CurrentCulture   = zhCN;

XplorePlane/Views/Main/MainWindow.xaml

@@ -8,6 +8,7 @@
     xmlns:spreadsheetControls="clr-namespace:Telerik.Windows.Controls.Spreadsheet.Controls;assembly=Telerik.Windows.Controls.Spreadsheet"
     xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
     xmlns:views="clr-namespace:XplorePlane.Views"
+    xmlns:views1="clr-namespace:XP.Hardware.RaySource.Views;assembly=XP.Hardware.RaySource"
     x:Name="ParentWindow"
     Title="XplorePlane"
     Width="1920"
@@ -45,7 +46,11 @@
             ApplicationButtonVisibility="Collapsed"
             ApplicationName="XplorePlane"
             BackstageClippingElement="{Binding ElementName=LayoutRoot}"
-            HeaderBackground="LightGray">
+            FontFamily="Microsoft YaHei"
+            FontSize="10"
+            HeaderBackground="LightGray"
+            TextOptions.TextFormattingMode="Display"
+            TextOptions.TextRenderingMode="ClearType">
 
             <telerik:RadRibbonView.Resources>
                 <spreadsheet:FunctionsProvider x:Key="FunctionsProvider" />
@@ -66,22 +71,31 @@
                     <!--  实时控制: Live / Snap / 加载 / 保存  -->
                     <StackPanel>
                         <telerik:RadRibbonButton
-                            telerik:ScreenTip.Title="加载CNC"
+                            telerik:ScreenTip.Title="新建CNC"
-                            Command="{Binding OpenFileCommand}"
+                            Command="{Binding Path=SetStyle.Command}"
                             Size="Medium"
-                            Text="📂 加载CNC" />
+                            SmallImage="/Assets/Icons/new-doc.png"
+                            Text="新建CNC" />
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Description="保存当前X射线实时图像"
                             telerik:ScreenTip.Title="保存图像"
                             Size="Medium"
-                            Text="💾 保存" />
+                            SmallImage="/Assets/Icons/save.png"
-                    </StackPanel>
+                            Text="保存" />
-                    <StackPanel>
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Title="另存为"
                             Command="{Binding OpenFileCommand}"
                             Size="Medium"
-                            Text="📂 另存为" />
+                            SmallImage="/Assets/Icons/saveas.png"
+                            Text="另存为" />
+                    </StackPanel>
+                    <StackPanel>
+                        <telerik:RadRibbonButton
+                            telerik:ScreenTip.Title="加载CNC"
+                            Command="{Binding OpenFileCommand}"
+                            Size="Medium"
+                            SmallImage="/Assets/Icons/open.png"
+                            Text="加载CNC" />
                     </StackPanel>
                 </telerik:RadRibbonGroup>
 
@@ -257,32 +271,12 @@
                         <telerik:GroupVariant Priority="0" Variant="Large" />
                     </telerik:RadRibbonGroup.Variants>
                     <StackPanel>
-                        <telerik:RadRibbonButton
-                            telerik:ScreenTip.Title="新建CNC"
-                            Command="{Binding Path=SetStyle.Command}"
-                            Size="Medium"
-                            SmallImage="/Assets/Icons/new-doc.png"
-                            Text="新建CNC" />
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Title="参考点"
                             Command="{Binding Path=SetStyle.Command}"
                             Size="Medium"
                             SmallImage="/Assets/Icons/reference.png"
                             Text="参考点" />
-                        <telerik:RadRibbonButton
-                            telerik:ScreenTip.Title="保存"
-                            Command="{Binding Path=SetStyle.Command}"
-                            Size="Medium"
-                            SmallImage="/Assets/Icons/save.png"
-                            Text="保存" />
-                    </StackPanel>
-                    <StackPanel>
-                        <telerik:RadRibbonButton
-                            telerik:ScreenTip.Title="全部保存"
-                            Command="{Binding Path=SetStyle.Command}"
-                            Size="Medium"
-                            SmallImage="/Assets/Icons/saveall.png"
-                            Text="全部保存" />
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Title="添加位置"
                             Command="{Binding Path=SetStyle.Command}"
@@ -290,19 +284,36 @@
                             SmallImage="/Assets/Icons/add-pos.png"
                             Text="添加位置" />
                         <telerik:RadRibbonButton
-                            telerik:ScreenTip.Title="模块"
+                            telerik:ScreenTip.Title="完成"
                             Command="{Binding Path=SetStyle.Command}"
                             Size="Medium"
-                            SmallImage="/Assets/Icons/Module.png"
+                            SmallImage="/Assets/Icons/finish.png"
-                            Text="模块" />
+                            Text="完成" />
                     </StackPanel>
+
                     <StackPanel>
+
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Title="标记"
                             Command="{Binding Path=SetStyle.Command}"
                             Size="Medium"
                             SmallImage="/Assets/Icons/mark.png"
                             Text="标记" />
+                        <telerik:RadRibbonButton
+                            telerik:ScreenTip.Title="模块"
+                            Command="{Binding Path=SetStyle.Command}"
+                            Size="Medium"
+                            SmallImage="/Assets/Icons/Module.png"
+                            Text="模块" />
+                        <telerik:RadRibbonButton
+                            telerik:ScreenTip.Title="全部保存"
+                            Command="{Binding Path=SetStyle.Command}"
+                            Size="Medium"
+                            SmallImage="/Assets/Icons/saveall.png"
+                            Text="全部保存" />
+                    </StackPanel>
+                    <StackPanel>
+
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Title="消息"
                             Command="{Binding Path=SetStyle.Command}"
@@ -316,14 +327,7 @@
                             SmallImage="/Assets/Icons/wait.png"
                             Text="等待" />
                     </StackPanel>
-                    <StackPanel>
+                    <StackPanel />
-                        <telerik:RadRibbonButton
-                            telerik:ScreenTip.Title="完成"
-                            Command="{Binding Path=SetStyle.Command}"
-                            Size="Medium"
-                            SmallImage="/Assets/Icons/finish.png"
-                            Text="完成" />
-                    </StackPanel>
                 </telerik:RadRibbonGroup>
 
                 <telerik:RadRibbonGroup Header="高级模块" IsEnabled="{Binding Path=CellsGroup.IsEnabled}">
@@ -382,7 +386,6 @@
                         Text="流水线编辑器" />
                 </telerik:RadRibbonGroup>
             </telerik:RadRibbonTab>
-
             <telerik:RadRibbonTab Header="关于">
                 <telerik:RadRibbonGroup Header="关于">
                     <telerik:RadRibbonGroup.Variants>

XplorePlane/XplorePlane.csproj

@@ -71,75 +71,67 @@
     </Reference>
   </ItemGroup>
 	
+  <!-- Telerik UI for WPF 2024 Q1 - NetCore (v2024.1.408.310) -->
+  <PropertyGroup>
+    <TelerikDir>D:\Program Files (x86)\Progress\Telerik UI for WPF 2024 Q1\Binaries\NetCore</TelerikDir>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Telerik.Windows.Controls">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.dll</HintPath>
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.dll</HintPath>
     </Reference>
     <Reference Include="Telerik.Windows.Controls.Chart">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Chart.dll</HintPath>
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.Chart.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.GridView">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.GridView.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.ImageEditor">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.ImageEditor.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.Input">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Input.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.Docking">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Docking.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.Navigation">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Navigation.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.RibbonView">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.RibbonView.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.RichTextBox">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.RichTextBox.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Controls.Spreadsheet">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Spreadsheet.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Data">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Documents.Core">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Documents.Fixed">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Fixed.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Documents.Spreadsheet">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Themes.Office2013">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Themes.Office2013.dll</HintPath>
-    </Reference>
-    <Reference Include="Telerik.Windows.Themes.Crystal">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Themes.Crystal.dll</HintPath>
     </Reference>
     <Reference Include="Telerik.Windows.Controls.Data">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Data.dll</HintPath>
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Docking">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.Docking.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.GridView">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.GridView.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.ImageEditor">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.ImageEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Input">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.Input.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Navigation">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.Navigation.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.RibbonView">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.RibbonView.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.RichTextBox">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.RichTextBox.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Spreadsheet">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.Spreadsheet.dll</HintPath>
     </Reference>
     <Reference Include="Telerik.Windows.Controls.SpreadsheetUI">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.SpreadsheetUI.dll</HintPath>
+      <HintPath>$(TelerikDir)\Telerik.Windows.Controls.SpreadsheetUI.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Data">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Documents.Core">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Documents.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Documents.Fixed">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Documents.Fixed.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Documents.Spreadsheet">
+      <HintPath>$(TelerikDir)\Telerik.Windows.Documents.Spreadsheet.dll</HintPath>
     </Reference>
     <Reference Include="Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll</HintPath>
+      <HintPath>$(TelerikDir)\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll</HintPath>
     </Reference>
     <Reference Include="Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf.dll</HintPath>
+      <HintPath>$(TelerikDir)\Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf.dll</HintPath>
     </Reference>
     <Reference Include="Telerik.Windows.Zip">
-      <HintPath>..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Zip.dll</HintPath>
+      <HintPath>$(TelerikDir)\Telerik.Windows.Zip.dll</HintPath>
     </Reference>
   </ItemGroup>
   

XplorePlane/readme.txt

@@ -43,7 +43,8 @@
 
 2026.3.26
 ----------------------
-1、各窗体间数据流的传递，全局数据结构的设计
+1、各窗体间数据流的传递，全局数据结构的设计（包括一个基本的说明文档）√
+2、集成