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/MTerm2Doc.h | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/MTerm2/MTerm2Doc.h b/MTerm2/MTerm2Doc.h
index 10965a4..f630dcc 100644
--- a/MTerm2/MTerm2Doc.h
+++ b/MTerm2/MTerm2Doc.h
@@ -5,15 +5,15 @@
#pragma once
#include "HvSerialPort.h"
-#include "CAnsiParser.h"
-#include "CDataParser1.h"
+#include "AnsiParser.h"
+#include "DataParser1.h"
#include "KDefine.h"
#include "KLink.h"
#include "KMachine.h"
-#include "../KLink2/KLink.h"
+#include "../KLink1/KLink.h"
-#pragma comment(lib,"KLink2.lib")
+#pragma comment(lib,"KLink1.lib")
class CMTerm2Doc : public CDocument
{
@@ -30,7 +30,7 @@
// CSerialCom MySerialCom1;
HvSerialPort myHvSerialPort1;
KMachine myKMachine1;
- KLink2 MyKlink2;
+ KLink1 MyKlink2;
bool m_bCommParamSet = false;
@@ -53,15 +53,15 @@
CString ProgTxt;
- struct stTypeDef
+ struct stTypeNameDef
{
int nType;
CStringA TypeTxt;
};
- static stTypeDef CoilTypeDef[];
+ static stTypeNameDef CoilTypeNameDef[];
static int nCoilTypeDefCount;
- static stTypeDef DataTypeDef[];
+ static stTypeNameDef DataTypeNameDef[];
static int nDataTypeDefCount;
stKMem KMem;
@@ -278,4 +278,7 @@
int ClearMonitor();
int DoPLCMonitor();
afx_msg void OnMenuStatusShow();
+ afx_msg void OnMenuFactCfg();
+ afx_msg void OnMenuDatetimeSet();
+ afx_msg void OnMenuEventLog();
};
--
Gitblit v1.9.1