From aac3b319965967f465881f3a8961904d57b6f337 Mon Sep 17 00:00:00 2001
From: zxd <zxdvslxy@gmail.com>
Date: 星期四, 28 九月 2023 17:01:41 +0800
Subject: [PATCH] 节前提交，包含部分图码的转换，提出单独函数专做转换
---
MTerm1/MTerm1.h | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/MTerm1/MTerm1.h b/MTerm1/MTerm1.h
index 2f34d58..224cf5c 100644
--- a/MTerm1/MTerm1.h
+++ b/MTerm1/MTerm1.h
@@ -1,5 +1,5 @@
锘�
-// MTerm1.h: MTerm1 搴旂敤绋嬪簭鐨勪富澶存枃浠�
+// MultiTerminal2.h: MultiTerminal2 搴旂敤绋嬪簭鐨勪富澶存枃浠�
//
#pragma once
@@ -11,6 +11,7 @@
#include "../mylib/LOGGER/Logger.hpp"
#include "../MyLib/MHashINI/MHash.hpp"
+
void Trans_Tunc(unsigned int, EXCEPTION_POINTERS*);
#define CHECKE(func) try {func;} catch(SE_Exception &e) {DisplayException(_T(__FILE__),__LINE__,_T(__FUNCTION__),_T(#func),e);} catch (CException * e) {DisplayException(_T(__FILE__),__LINE__,_T(__FUNCTION__),_T(#func),e);} catch (...){DisplayException(_T(__FILE__),__LINE__,_T(__FUNCTION__),_T(#func));}
class SE_Exception
@@ -38,21 +39,39 @@
int SaveMyConfig();
int LoadMyConfig();
-int SysLog(CString s, int channel = 0);
+int SysLog(CString s, int channel = 0);
+int DbgLog(CString s, int channel = 0);
+
int PopupMessage(CString s, int channel = 0);
void DoEvents();
extern MHash MyCfg1;
-extern Logger MyLogger1;
+extern Logger myLogger1;
+
// CMTerm1App:
-// 鏈夊叧姝ょ被鐨勫疄鐜帮紝璇峰弬闃� MTerm1.cpp
+// 鏈夊叧姝ょ被鐨勫疄鐜帮紝璇峰弬闃� MultiTerminal2.cpp
//
class CMTerm1App : public CWinAppEx
{
public:
CMTerm1App() noexcept;
+ CMultiDocTemplate* pDocTemplate;
+
+ CMultiDocTemplate * m_pLdsViewTemplate;
+ CMultiDocTemplate * m_pBldViewTemplate;
+ CMultiDocTemplate * m_pBnlViewTemplate;
+ CMultiDocTemplate * m_pCtrlViewTemplate;
+ CMultiDocTemplate * m_pProgViewTemplate;
+
+ CMultiDocTemplate * m_pCoilViewTemplate;
+ CMultiDocTemplate * m_pDataViewTemplate;
+
+ CMultiDocTemplate * m_pCommDevViewTemplate;
+
+
+ CMultiDocTemplate * m_pNewDocTemplate;
// 閲嶅啓
@@ -61,34 +80,32 @@
virtual int ExitInstance();
// 瀹炵幇
- UINT m_nAppLook;
- BOOL m_bHiColorIcons;
-
- virtual void PreLoadState();
- virtual void LoadCustomState();
- virtual void SaveCustomState();
+ bool m_bHiColorIcons;
afx_msg void OnAppAbout();
DECLARE_MESSAGE_MAP()
- ULONG_PTR m_gdiplusToken;
+ afx_msg void OnFileNew();
+ afx_msg void OnComunicationSet();
+ afx_msg void OnEnvSet();
};
extern CMTerm1App theApp;
-class CAnsiParser;
-class CDataParser1;
-class KLinkProtocol;
-class CSerialCom;
-class HvSerialPort;
+//class CAnsiParser;
+//class CDataParser1;
+//class KLink;
+//class CSerialCom;
+//class HvSerialPort;
-extern CAnsiParser MyAnsiParser1;
-extern CDataParser1 MyDataParser1;
-extern KLinkProtocol MyKLProtocol1;
+//extern CAnsiParser MyAnsiParser1;
+//extern CDataParser1 MyDataParser1;
+//extern KLink MyKLink1;
// extern CSerialCom MySerialCom1;
-extern HvSerialPort MyHvSerialPort1;
+//extern HvSerialPort myHvSerialPort1;
-CString & intToString(int num);
+CString & intToString(int num,int digit=0);
CString & intToBinString(int num, int digits = 8);
int get_com_name(CString comx, CString &namebuf);
+
--
Gitblit v1.9.1