From 0677e1aaead1762fc19c16c82a02926ec6d21b8a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 13 十二月 2024 11:59:01 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/BondEq.vcxproj | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index f39bd84..a43d4f8 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -191,6 +191,7 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="AlarmPopupDlg.h" />
<ClInclude Include="CComponentDlg.h" />
<ClInclude Include="CComponentPLCDlg.h" />
<ClInclude Include="CPLC.h" />
@@ -219,6 +220,7 @@
<ClInclude Include="Common.h" />
<ClInclude Include="Configuration.h" />
<ClInclude Include="CPanelProject.h" />
+ <ClInclude Include="DBManager\AlarmManager.h" />
<ClInclude Include="DBManager\AxisManager.h" />
<ClInclude Include="DBManager\SystemLogManager.h" />
<ClInclude Include="DBManager\UserManager.h" />
@@ -244,6 +246,7 @@
<ClInclude Include="Model.h" />
<ClInclude Include="CPageAlarm.h" />
<ClInclude Include="Recipe.h" />
+ <ClInclude Include="RegexEdit.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="SetPage1.h" />
<ClInclude Include="SetPage2.h" />
@@ -255,6 +258,7 @@
<ClInclude Include="ToolUnits.h" />
<ClInclude Include="TopToolbar.h" />
<ClInclude Include="VerticalLine.h" />
+ <ClInclude Include="View\AxisDetailSettingsDlg.h" />
<ClInclude Include="View\AxisSettingsDlg.h" />
<ClInclude Include="View\ChangePasswordDlg.h" />
<ClInclude Include="View\IOMonitoringDlg.h" />
@@ -263,6 +267,7 @@
<ClInclude Include="View\UserManagerDlg.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="AlarmPopupDlg.cpp" />
<ClCompile Include="CComponentDlg.cpp" />
<ClCompile Include="CComponentPLCDlg.cpp" />
<ClCompile Include="CPLC.cpp" />
@@ -290,6 +295,7 @@
<ClCompile Include="CProjectPageRemoteEqs.cpp" />
<ClCompile Include="Configuration.cpp" />
<ClCompile Include="CPanelProject.cpp" />
+ <ClCompile Include="DBManager\AlarmManager.cpp" />
<ClCompile Include="DBManager\AxisManager.cpp" />
<ClCompile Include="DBManager\SystemLogManager.cpp" />
<ClCompile Include="DBManager\UserManager.cpp" />
@@ -316,6 +322,7 @@
<ClCompile Include="Model.cpp" />
<ClCompile Include="CPageAlarm.cpp" />
<ClCompile Include="Recipe.cpp" />
+ <ClCompile Include="RegexEdit.cpp" />
<ClCompile Include="SetPage1.cpp" />
<ClCompile Include="SetPage2.cpp" />
<ClCompile Include="SettingsDlg.cpp" />
@@ -331,6 +338,7 @@
<ClCompile Include="ToolUnits.cpp" />
<ClCompile Include="TopToolbar.cpp" />
<ClCompile Include="VerticalLine.cpp" />
+ <ClCompile Include="View\AxisDetailSettingsDlg.cpp" />
<ClCompile Include="View\AxisSettingsDlg.cpp" />
<ClCompile Include="View\ChangePasswordDlg.cpp" />
<ClCompile Include="View\IOMonitoringDlg.cpp" />
--
Gitblit v1.9.3