From c6edbd1df725b75f0b1ed97ca178ea4e3231b25f Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 09 十二月 2024 14:18:11 +0800
Subject: [PATCH] 1. axis设定先写入PLC，间隔2秒后更新界面和配方 2. IO模块如果是可以点击的信号，移动到控件上鼠标显示点击图标 3. io模块添加圆角功能
---
SourceCode/Bond/BondEq/BondEq.vcxproj | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index dbd0af1..f39bd84 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -115,7 +115,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
- <AdditionalIncludeDirectories>.;.\View;.\DBManager;..\DatabaseSDK\include;..\BLControlsSDK\include;..\BLControlsSDK\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;.\View;.\DBManager;.\FileManager;..\DatabaseSDK\include;..\BLControlsSDK\include;..\BLControlsSDK\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -191,6 +191,8 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="CComponentDlg.h" />
+ <ClInclude Include="CComponentPLCDlg.h" />
<ClInclude Include="CPLC.h" />
<ClInclude Include="AccordionWnd.h" />
<ClInclude Include="Alarm.h" />
@@ -222,6 +224,10 @@
<ClInclude Include="DBManager\UserManager.h" />
<ClInclude Include="EQState.h" />
<ClInclude Include="EQStateMonitor.h" />
+ <ClInclude Include="FileManager\IOManager.h" />
+ <ClInclude Include="FileManager\pugiconfig.hpp" />
+ <ClInclude Include="FileManager\pugixml.hpp" />
+ <ClInclude Include="FileManager\RecipeManager.h" />
<ClInclude Include="GB2860SQLite.h" />
<ClInclude Include="HmTab.h" />
<ClInclude Include="HmVerticalTab.h" />
@@ -251,11 +257,14 @@
<ClInclude Include="VerticalLine.h" />
<ClInclude Include="View\AxisSettingsDlg.h" />
<ClInclude Include="View\ChangePasswordDlg.h" />
+ <ClInclude Include="View\IOMonitoringDlg.h" />
<ClInclude Include="View\LoginDlg.h" />
<ClInclude Include="View\SystemLogManagerDlg.h" />
<ClInclude Include="View\UserManagerDlg.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="CComponentDlg.cpp" />
+ <ClCompile Include="CComponentPLCDlg.cpp" />
<ClCompile Include="CPLC.cpp" />
<ClCompile Include="AccordionWnd.cpp" />
<ClCompile Include="Alarm.cpp" />
@@ -286,6 +295,11 @@
<ClCompile Include="DBManager\UserManager.cpp" />
<ClCompile Include="EQState.cpp" />
<ClCompile Include="EQStateMonitor.cpp" />
+ <ClCompile Include="FileManager\IOManager.cpp" />
+ <ClCompile Include="FileManager\pugixml.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="FileManager\RecipeManager.cpp" />
<ClCompile Include="GB2860SQLite.cpp" />
<ClCompile Include="HmTab.cpp" />
<ClCompile Include="HmVerticalTab.cpp" />
@@ -319,6 +333,7 @@
<ClCompile Include="VerticalLine.cpp" />
<ClCompile Include="View\AxisSettingsDlg.cpp" />
<ClCompile Include="View\ChangePasswordDlg.cpp" />
+ <ClCompile Include="View\IOMonitoringDlg.cpp" />
<ClCompile Include="View\LoginDlg.cpp" />
<ClCompile Include="View\SystemLogManagerDlg.cpp" />
<ClCompile Include="View\UserManagerDlg.cpp" />
@@ -340,7 +355,7 @@
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
- <UserProperties RESOURCE_FILE="BondServo.rc" />
+ <UserProperties RESOURCE_FILE="" />
</VisualStudio>
</ProjectExtensions>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3