From fe2aa4880d5c9fd88088ad0ed81ebaca05629f5f Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 17:59:45 +0800
Subject: [PATCH] feat: 集成CAN驱动/模拟器 + 仪器仪表注册/硬件调试模块
---
WPFProject/App.xaml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/WPFProject/App.xaml b/WPFProject/App.xaml
index 289fbe1..484c7c0 100644
--- a/WPFProject/App.xaml
+++ b/WPFProject/App.xaml
@@ -19,7 +19,12 @@
<ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/MsgBoxStyle.xaml"/>
<ResourceDictionary Source="/HMI.Base;component/MaskControl.xaml"/>
+ <ResourceDictionary Source="/UILib;component/Styles.xaml"/>
+ <ResourceDictionary Source="/SeqEditor;component/UIStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
+ <FontFamily x:Key="iconfont">
+ /HMI.UI;component/Resources/Font/#iconfont
+ </FontFamily>
<sys:Double x:Key="nanD">NaN</sys:Double>
<Style TargetType="{x:Type pu:FormGroup}" BasedOn="{StaticResource InputFormGroupStyle}"></Style>
<uic:PathImageConverter x:Key="path2Image"/>
--
Gitblit v1.9.1