From 4ed7fc8447d202e21ef9907e2aac63ef6fcbf301 Mon Sep 17 00:00:00 2001
From: zxd <zxdvslxy@gmail.com>
Date: 星期二, 17 十月 2023 12:33:23 +0800
Subject: [PATCH] 提交图码转换部分修改： 1.基本图形转换 2.ANS\ORS\PSHS\POPS命令的处理 3.重构了转换方法，命名为CMTerm1View::ScanLDSCells2();同时将翻译单独提出为方法CMTerm1View::Translate2Prog() 4.快捷键的添加绑定 5.其他相关方法修改，Insert，Delete，FocusChg…… 6.其他关联修改
---
MTerm2/MTerm2.vcxproj | 100 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 68 insertions(+), 32 deletions(-)
diff --git a/MTerm2/MTerm2.vcxproj b/MTerm2/MTerm2.vcxproj
index b4491a4..d227e93 100644
--- a/MTerm2/MTerm2.vcxproj
+++ b/MTerm2/MTerm2.vcxproj
@@ -23,21 +23,21 @@
<ProjectGuid>{521DEE85-086F-4A6F-B926-135FC1F65267}</ProjectGuid>
<Keyword>MFCProj</Keyword>
<RootNamespace>MTerm2</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>MTerm2</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
@@ -45,14 +45,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
@@ -80,12 +80,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
+ <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;D:\WORK\VC_WORK\MTerm1\x64\Debug</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
+ <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;x64\Release</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -188,10 +190,12 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="CAnsiParser.h" />
- <ClInclude Include="CDataParser1.h" />
- <ClInclude Include="CDialogCoilMon.h" />
- <ClInclude Include="CDialogCommSet1.h" />
+ <ClInclude Include="AnsiParser.h" />
+ <ClInclude Include="CMyFuncKeyToolBar.h" />
+ <ClInclude Include="DataParser1.h" />
+ <ClInclude Include="DialogCoilMon.h" />
+ <ClInclude Include="DialogCommSet1.h" />
+ <ClInclude Include="DialogFactCfg.h" />
<ClInclude Include="DialogIoComment.h" />
<ClInclude Include="DialogSetCoil.h" />
<ClInclude Include="DialogSetData.h" />
@@ -199,16 +203,23 @@
<ClInclude Include="KMachine.h" />
<ClInclude Include="MTerm2CommDevView.h" />
<ClInclude Include="MTerm2CommTestView.h" />
- <ClInclude Include="CDialogDataMon.h" />
- <ClInclude Include="CDialogDateTime.h" />
- <ClInclude Include="CDialogEventLog.h" />
- <ClInclude Include="CDialogForceIO.h" />
- <ClInclude Include="CDialogInfoDisplay.h" />
- <ClInclude Include="CDialogProgress.h" />
- <ClInclude Include="CDialogStatusShow.h" />
- <ClInclude Include="CDialogSysRegSet.h" />
+ <ClInclude Include="DialogDataMon.h" />
+ <ClInclude Include="DialogDateTime.h" />
+ <ClInclude Include="DialogEventLog.h" />
+ <ClInclude Include="DialogForceIO.h" />
+ <ClInclude Include="DialogInfoDisplay.h" />
+ <ClInclude Include="DialogProgress.h" />
+ <ClInclude Include="DialogStatusShow.h" />
+ <ClInclude Include="DialogSysRegSet.h" />
<ClInclude Include="ChildFrm.h" />
- <ClInclude Include="CPropSysReg1.h" />
+ <ClInclude Include="MyDlgBarFuncKey.h" />
+ <ClInclude Include="MyDlgBarInputShow.h" />
+ <ClInclude Include="PropCommCfg.h" />
+ <ClInclude Include="PropInputCfg.h" />
+ <ClInclude Include="PropMemCfg.h" />
+ <ClInclude Include="PropModeCfg.h" />
+ <ClInclude Include="PropOutputCfg.h" />
+ <ClInclude Include="PropSysReg1.h" />
<ClInclude Include="HvSerialPort.h" />
<ClInclude Include="KLinkDefine.h" />
<ClInclude Include="KLink.h" />
@@ -228,32 +239,43 @@
<ClInclude Include="MyDialogLog.h" />
<ClInclude Include="MyFormLog.h" />
<ClInclude Include="MyPaneLog.h" />
+ <ClInclude Include="NavView.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="targetver.h" />
+ <ClInclude Include="ViewTree.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\MyLib\StaticEx.cpp" />
- <ClCompile Include="CAnsiParser.cpp" />
- <ClCompile Include="CDataParser1.cpp" />
- <ClCompile Include="CDialogCoilMon.cpp" />
- <ClCompile Include="CDialogCommSet1.cpp" />
+ <ClCompile Include="AnsiParser.cpp" />
+ <ClCompile Include="CMyFuncKeyToolBar.cpp" />
+ <ClCompile Include="DataParser1.cpp" />
+ <ClCompile Include="DialogCoilMon.cpp" />
+ <ClCompile Include="DialogCommSet1.cpp" />
+ <ClCompile Include="DialogFactCfg.cpp" />
<ClCompile Include="DialogIoComment.cpp" />
<ClCompile Include="DialogSetCoil.cpp" />
<ClCompile Include="DialogSetData.cpp" />
<ClCompile Include="KMachine.cpp" />
<ClCompile Include="MTerm2CommDevView.cpp" />
<ClCompile Include="MTerm2CommTestView.cpp" />
- <ClCompile Include="CDialogDataMon.cpp" />
- <ClCompile Include="CDialogDateTime.cpp" />
- <ClCompile Include="CDialogEventLog.cpp" />
- <ClCompile Include="CDialogForceIO.cpp" />
- <ClCompile Include="CDialogInfoDisplay.cpp" />
- <ClCompile Include="CDialogProgress.cpp" />
- <ClCompile Include="CDialogStatusShow.cpp" />
- <ClCompile Include="CDialogSysRegSet.cpp" />
+ <ClCompile Include="DialogDataMon.cpp" />
+ <ClCompile Include="DialogDateTime.cpp" />
+ <ClCompile Include="DialogEventLog.cpp" />
+ <ClCompile Include="DialogForceIO.cpp" />
+ <ClCompile Include="DialogInfoDisplay.cpp" />
+ <ClCompile Include="DialogProgress.cpp" />
+ <ClCompile Include="DialogStatusShow.cpp" />
+ <ClCompile Include="DialogSysRegSet.cpp" />
<ClCompile Include="ChildFrm.cpp" />
- <ClCompile Include="CPropSysReg1.cpp" />
+ <ClCompile Include="MyDlgBarFuncKey.cpp" />
+ <ClCompile Include="MyDlgBarInputShow.cpp" />
+ <ClCompile Include="PropCommCfg.cpp" />
+ <ClCompile Include="PropInputCfg.cpp" />
+ <ClCompile Include="PropMemCfg.cpp" />
+ <ClCompile Include="PropModeCfg.cpp" />
+ <ClCompile Include="PropOutputCfg.cpp" />
+ <ClCompile Include="PropSysReg1.cpp" />
<ClCompile Include="HvSerialPort.cpp" />
<ClCompile Include="KLink.cpp" />
<ClCompile Include="MTerm2ProgTxt.cpp" />
@@ -271,35 +293,49 @@
<ClCompile Include="MyDialogLog.cpp" />
<ClCompile Include="MyFormLog.cpp" />
<ClCompile Include="MyPaneLog.cpp" />
+ <ClCompile Include="NavView.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
+ <ClCompile Include="ViewTree.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="MTerm2.rc" />
</ItemGroup>
<ItemGroup>
+ <None Include="devices.cfg" />
<None Include="res\MTerm2.rc2" />
</ItemGroup>
<ItemGroup>
+ <Image Include="res\bitmap1.bmp" />
<Image Include="res\bmp00001.bmp" />
<Image Include="res\bmp00002.bmp" />
<Image Include="res\bmp00003.bmp" />
+ <Image Include="res\bmp00004.bmp" />
+ <Image Include="res\classview.bmp" />
+ <Image Include="res\classview_hc.bmp" />
+ <Image Include="res\class_view.ico" />
+ <Image Include="res\class_view_hc.ico" />
<Image Include="res\ico00001.ico" />
<Image Include="res\ico00002.ico" />
<Image Include="res\idr_mult.ico" />
<Image Include="res\mainfram.bmp" />
<Image Include="res\MTerm2.ico" />
<Image Include="res\MTerm2Doc.ico" />
+ <Image Include="res\sort.bmp" />
+ <Image Include="res\sort_hc.bmp" />
<Image Include="res\Toolbar.bmp" />
<Image Include="res\toolbar1.bmp" />
<Image Include="res\toolbar2.bmp" />
+ <Image Include="res\toolbar_.bmp" />
+ <Image Include="res\toolbar_func_key.bmp" />
</ItemGroup>
<ItemGroup>
- <Text Include="..\MTerm1\Prog.txt" />
+ <Text Include="design1.txt" />
+ <Text Include="FP0Ext.cfg" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
--
Gitblit v1.9.1