From 61deef5cdf96cbfdd6ad45be49e80d597c00ca65 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期二, 24 十二月 2024 08:37:21 +0800
Subject: [PATCH] 2024-12-24
---
MTerm1/MainFrm.h | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/MTerm1/MainFrm.h b/MTerm1/MainFrm.h
index 577a66a..8b82b79 100644
--- a/MTerm1/MainFrm.h
+++ b/MTerm1/MainFrm.h
@@ -13,6 +13,9 @@
#include "MyDlgBarFuncKey.h"
#include "MyDialogLog.h"
#include "MyDlgBarInputShow.h"
+#include "CMyPaneInputShow.h"
+#include "MTerm1CommDevView.h"
+#include "ConfigToolView.h"
class CMainFrame : public CMDIFrameWndEx
{
@@ -41,24 +44,28 @@
protected: // 鎺т欢鏉″祵鍏ユ垚鍛�
CMFCToolBar m_wndToolBar;
- CMyFuncKeyToolBar m_wndToolBar_Func_Key;
+// CMyFuncKeyToolBar m_wndToolBar_Func_Key;
// CMyDlgBarFuncKey m_wndDlgBar_Func_Key;
// CToolBar m_wndTBar_Edit_Key;
// CToolBar m_wndTBar_Num_Key;
// CToolBar m_wndTBar_InputShow;
// CMyDlgBarInputShow m_wndDlgBar_InputShow;
- CToolBar m_wndToolBar_Comments;
+// CToolBar m_wndToolBar_Comments;
CNavView m_wndNavView;
- CEdit m_InputShowEdit;
- CStaticEx m_InputShowStatic;
+// CEdit m_InputShowEdit;
+// CStaticEx m_InputShowStatic;
-
+
CMyPaneLog m_wndMyPaneLog;
// CMyDialogLog m_dlgMyLog;
- CMyDlgBarInputShow::tagInputCell localInputCell;
+
+
+ CMyPaneInputShow m_wndMyPaneInputShow;
+ CMTerm1CommDevView* m_pCommDevView = nullptr;
+ CConfigToolView* m_pConfigToolView = nullptr;
// 鐢熸垚鐨勬秷鎭槧灏勫嚱鏁�
protected:
@@ -80,34 +87,28 @@
// afx_msg void OnMenuViewLds();
// afx_msg void OnMenuViewBld();
// afx_msg void OnMenuViewBnl();
+
+ int SetDisplayInfo(int Info);
+
+ CMyFormInputShow* GetInputWnd() {
+ return m_wndMyPaneInputShow.m_pMyFormInputShow;
+ };
+
+ int SetCellInfo(int info);
int GetInputInfo(int inputInfo);
- int GetInputCell(CMyDlgBarInputShow::tagInputCell inputCell);
+ int GetInputCell(tagInputCell inputCell);
+
afx_msg void OnMenuShowLog();
virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
- afx_msg void OnBtn0();
- afx_msg void OnBtn1();
- afx_msg void OnBtn2();
- afx_msg void OnBtn3();
- afx_msg void OnBtn4();
- afx_msg void OnBtn5();
- afx_msg void OnBtn6();
- afx_msg void OnBtn7();
- afx_msg void OnBtn8();
- afx_msg void OnBtn9();
- afx_msg void OnBtnA();
- afx_msg void OnBtnB();
- afx_msg void OnBtnC();
- afx_msg void OnBtnD();
- afx_msg void OnBtnE();
- afx_msg void OnBtnF();
- afx_msg void OnBtnMinus();
- afx_msg void OnBtnDot();
- afx_msg void OnBtnRet();
- afx_msg void OnBtnInsert();
- afx_msg void OnBtnDelete();
- afx_msg void OnBtnEsc();
+
afx_msg void OnMenuShowDev();
+ afx_msg void OnMenuShownav();
+ virtual BOOL PreTranslateMessage(MSG* pMsg);
+ afx_msg void OnCommtest();
+ afx_msg void OnDeviceConfig();
+
+
};
--
Gitblit v1.9.1