From 2b87741f1a372c6da84d6ae3839ff2cf6297b71f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 10 二月 2026 14:27:31 +0800
Subject: [PATCH] 1.状态图格子坐标从配置文件中读取；
---
SourceCode/Bond/BondEq/BondEq.vcxproj | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index 926d220..432fb35 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{7864134E-C538-4C0F-AF24-215FFCCBBAB4}</ProjectGuid>
<RootNamespace>BondServo</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
<Keyword>MFCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -43,14 +43,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
@@ -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,12 +191,15 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="AlarmPopupDlg.h" />
+ <ClInclude Include="CBaseDlg.h" />
+ <ClInclude Include="CComponentDlg.h" />
+ <ClInclude Include="CComponentPLCDlg.h" />
<ClInclude Include="CPLC.h" />
<ClInclude Include="AccordionWnd.h" />
<ClInclude Include="Alarm.h" />
<ClInclude Include="AlarmMonitor.h" />
<ClInclude Include="ApredTreeCtrl.h" />
- <ClInclude Include="AxisSettingsDlg.h" />
<ClInclude Include="BaseSetPage.h" />
<ClInclude Include="BlButton.h" />
<ClInclude Include="BondEq.h" />
@@ -208,6 +211,8 @@
<ClInclude Include="Context.h" />
<ClInclude Include="CPanel.h" />
<ClInclude Include="CParam.h" />
+ <ClInclude Include="CProjectPageComponents.h" />
+ <ClInclude Include="CProjectPageMain.h" />
<ClInclude Include="CRemoteEqUnitView.h" />
<ClInclude Include="CRemoteEqView.h" />
<ClInclude Include="CHomeDialog.h" />
@@ -217,10 +222,17 @@
<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" />
<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" />
<ClInclude Include="HorizontalLine.h" />
@@ -236,27 +248,37 @@
<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" />
<ClInclude Include="SettingsDlg.h" />
+ <ClInclude Include="sqlite3.h" />
+ <ClInclude Include="sqlite3ext.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
<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" />
<ClInclude Include="View\LoginDlg.h" />
+ <ClInclude Include="View\RecipeListDlg.h" />
<ClInclude Include="View\SystemLogManagerDlg.h" />
<ClInclude Include="View\UserManagerDlg.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="AlarmPopupDlg.cpp" />
+ <ClCompile Include="CBaseDlg.cpp" />
+ <ClCompile Include="CComponentDlg.cpp" />
+ <ClCompile Include="CComponentPLCDlg.cpp" />
<ClCompile Include="CPLC.cpp" />
<ClCompile Include="AccordionWnd.cpp" />
<ClCompile Include="Alarm.cpp" />
<ClCompile Include="AlarmMonitor.cpp" />
<ClCompile Include="ApredTreeCtrl.cpp" />
- <ClCompile Include="AxisSettingsDlg.cpp" />
<ClCompile Include="BaseSetPage.cpp" />
<ClCompile Include="BlButton.cpp" />
<ClCompile Include="BondEq.cpp" />
@@ -268,6 +290,8 @@
<ClCompile Include="Context.cpp" />
<ClCompile Include="CPanel.cpp" />
<ClCompile Include="CParam.cpp" />
+ <ClCompile Include="CProjectPageComponents.cpp" />
+ <ClCompile Include="CProjectPageMain.cpp" />
<ClCompile Include="CRemoteEqUnitView.cpp" />
<ClCompile Include="CRemoteEqView.cpp" />
<ClCompile Include="CHomeDialog.cpp" />
@@ -276,10 +300,18 @@
<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" />
<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" />
<ClCompile Include="HorizontalLine.cpp" />
@@ -295,9 +327,13 @@
<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" />
+ <ClCompile Include="sqlite3.c">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -307,8 +343,12 @@
<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" />
<ClCompile Include="View\LoginDlg.cpp" />
+ <ClCompile Include="View\RecipeListDlg.cpp" />
<ClCompile Include="View\SystemLogManagerDlg.cpp" />
<ClCompile Include="View\UserManagerDlg.cpp" />
</ItemGroup>
@@ -329,7 +369,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