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.filters |  258 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 177 insertions(+), 81 deletions(-)

diff --git a/MTerm2/MTerm2.vcxproj.filters b/MTerm2/MTerm2.vcxproj.filters
index 632582c..6407080 100644
--- a/MTerm2/MTerm2.vcxproj.filters
+++ b/MTerm2/MTerm2.vcxproj.filters
@@ -57,45 +57,6 @@
     <ClInclude Include="MTerm2ProgTxt.h">
       <Filter>澶存枃浠�</Filter>
     </ClInclude>
-    <ClInclude Include="CAnsiParser.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDataParser1.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogCoilMon.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogCommSet1.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogDataMon.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogDateTime.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogEventLog.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogForceIO.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogInfoDisplay.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogProgress.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogStatusShow.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CDialogSysRegSet.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-    <ClInclude Include="CPropSysReg1.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
     <ClInclude Include="HvSerialPort.h">
       <Filter>澶存枃浠�</Filter>
     </ClInclude>
@@ -144,6 +105,78 @@
     <ClInclude Include="KMachine.h">
       <Filter>澶存枃浠�</Filter>
     </ClInclude>
+    <ClInclude Include="NavView.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="ViewTree.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="AnsiParser.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DataParser1.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogCoilMon.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogCommSet1.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogDataMon.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogDateTime.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogEventLog.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogForceIO.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogInfoDisplay.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogProgress.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogStatusShow.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogSysRegSet.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="PropSysReg1.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="PropMemCfg.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="PropModeCfg.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="PropCommCfg.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="PropInputCfg.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="PropOutputCfg.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="DialogFactCfg.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="CMyFuncKeyToolBar.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="MyDlgBarFuncKey.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
+    <ClInclude Include="MyDlgBarInputShow.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="MainFrm.cpp">
@@ -177,45 +210,6 @@
       <Filter>婧愭枃浠�</Filter>
     </ClCompile>
     <ClCompile Include="MTerm2ProgTxt.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CAnsiParser.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDataParser1.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogCoilMon.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogCommSet1.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogDataMon.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogDateTime.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogEventLog.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogForceIO.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogInfoDisplay.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogProgress.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogStatusShow.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CDialogSysRegSet.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="CPropSysReg1.cpp">
       <Filter>婧愭枃浠�</Filter>
     </ClCompile>
     <ClCompile Include="HvSerialPort.cpp">
@@ -263,6 +257,78 @@
     <ClCompile Include="KMachine.cpp">
       <Filter>婧愭枃浠�</Filter>
     </ClCompile>
+    <ClCompile Include="NavView.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="ViewTree.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogSysRegSet.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogStatusShow.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogProgress.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogInfoDisplay.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogForceIO.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogEventLog.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogDateTime.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogDataMon.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogCommSet1.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogCoilMon.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DataParser1.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="AnsiParser.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="PropSysReg1.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="PropMemCfg.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="PropModeCfg.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="PropCommCfg.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="PropInputCfg.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="PropOutputCfg.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="DialogFactCfg.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="CMyFuncKeyToolBar.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="MyDlgBarFuncKey.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
+    <ClCompile Include="MyDlgBarInputShow.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="MTerm2.rc">
@@ -273,6 +339,7 @@
     <None Include="res\MTerm2.rc2">
       <Filter>璧勬簮鏂囦欢</Filter>
     </None>
+    <None Include="devices.cfg" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\Toolbar.bmp">
@@ -311,10 +378,39 @@
     <Image Include="res\toolbar2.bmp">
       <Filter>璧勬簮鏂囦欢</Filter>
     </Image>
+    <Image Include="res\class_view.ico">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\class_view_hc.ico">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\sort.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\classview.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\classview_hc.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\sort_hc.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\bitmap1.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\toolbar_.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\toolbar_func_key.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
+    <Image Include="res\bmp00004.bmp">
+      <Filter>璧勬簮鏂囦欢</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\MTerm1\Prog.txt">
-      <Filter>婧愭枃浠�</Filter>
-    </Text>
+    <Text Include="design1.txt" />
+    <Text Include="FP0Ext.cfg" />
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1