From df685a2064abd0fef557c250dcb7bbd38f480826 Mon Sep 17 00:00:00 2001
From: Yao Chunli <56721587@qq.com>
Date: 星期二, 21 六月 2022 16:37:00 +0800
Subject: [PATCH] Merge branch 'dev2' of http://3u015c326.zicp.vip:8111/r/MultiTerminal1 into dev2
---
MTerm2/MyDlgBarFuncKey.h | 132 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 130 insertions(+), 2 deletions(-)
diff --git a/MTerm2/MyDlgBarFuncKey.h b/MTerm2/MyDlgBarFuncKey.h
index c450263..5526700 100644
--- a/MTerm2/MyDlgBarFuncKey.h
+++ b/MTerm2/MyDlgBarFuncKey.h
@@ -3,11 +3,71 @@
// CMyDlgBarFuncKey 瀵硅瘽妗�
+#define IDC_BUTTON_AND 33101
+#define IDC_BUTTON_OR 33102
+#define IDC_BUTTON_VLINE 33103
+#define IDC_BUTTON_OUT 33104
+#define IDC_BUTTON_TMCT 33105
+#define IDC_BUTTON_FUN 33106
+#define IDC_BUTTON_HLINE 33107
+#define IDC_BUTTON_NOT 33108
+#define IDC_BUTTON_INDEX 33109
+#define IDC_BUTTON_MC 33110
+#define IDC_BUTTON_MCE 33111
+
+#define IDC_BUTTON_SET 33201
+#define IDC_BUTTON_RESET 33202
+#define IDC_BUTTON_DF 33203
+#define IDC_BUTTON_END 33204
+#define IDC_BUTTON_COMPARE 33205
+#define IDC_BUTTON_PFUN 33206
+#define IDC_BUTTON_UPDOWN 33207
+#define IDC_BUTTON_BIT 33208
+#define IDC_BUTTON_WORD 33209
+#define IDC_BUTTON_INSTRUCTION1 33210
+#define IDC_BUTTON_INSTRUCTION2 33211
+
+#define IDC_BUTTON_PGCONVERT 33301
+#define IDC_BUTTON_ONLINE 33302
+#define IDC_BUTTON_OFFLINE 33303
+#define IDC_BUTTON_COLSE 33304
+#define IDC_BUTTON_FIND 33305
+#define IDC_BUTTON_NEXTWIN 33306
+#define IDC_BUTTON_MONITOR 33307
+#define IDC_BUTTON_STATUS 33308
+#define IDC_BUTTON_RUNPROG 33309
+#define IDC_BUTTON_PLCREAD 33310
+#define IDC_BUTTON_PLCWRITE 33311
+
+#define IDC_BUTTON_X 33401
+#define IDC_BUTTON_Y 33402
+#define IDC_BUTTON_R 33403
+#define IDC_BUTTON_L 33404
+#define IDC_BUTTON_P 33405
+#define IDC_BUTTON_COMPARE1 33406
+#define IDC_BUTTON_NOT1 33408
+#define IDC_BUTTON_T 33501
+#define IDC_BUTTON_C 33502
+#define IDC_BUTTON_E 33503
+#define IDC_BUTTON_UPDOWN1 33507
+
+#define IDC_BUTTON_D 33701
+#define IDC_BUTTON_F 33702
+#define IDC_BUTTON_NEQ 33706
+#define IDC_BUTTON_GT 33707
+#define IDC_BUTTON_LT 33708
+
+#define IDC_BUTTON_TMX 34701
+#define IDC_BUTTON_TMY 34702
+#define IDC_BUTTON_TMR 34703
+#define IDC_BUTTON_TML 34704
+#define IDC_BUTTON_CT 34706
class CMyDlgBarFuncKey : public CDialogBar
{
DECLARE_DYNAMIC(CMyDlgBarFuncKey)
+
typedef struct tagStructButton {
int nID;
CString sCaption;
@@ -28,12 +88,80 @@
DECLARE_MESSAGE_MAP()
public:
- CButton m_buttons[3][12];
+ CButton m_buttons[6][3][11];
+ //CButton m_buttons_init[3][11];
+ //CButton m_buttons_bit[3][11];
+ //CButton m_buttons_compare[3][11];
+ //CButton m_buttons_word[3][11];
+ //CButton m_buttons_index[3][11];
+ //CButton m_buttons_TMCT[3][11];
- int m_Lines=3;
+ int m_Lines = 3;
+ CFont font1;
+ int current_btn_window = 0;
LRESULT OnInitDialog(WPARAM wParam, LPARAM lParam);
virtual BOOL Create(CWnd* pParentWnd, UINT nIDTemplate, UINT nStyle, UINT nID);
virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHandler);
+ void SetBtnDisplayESC();
+
+
afx_msg void OnBnClickedButton1();
+ afx_msg void OnBnClickedBtnAnd();
+ afx_msg void OnBnClickedBtnOr();
+ afx_msg void OnBnClickedBtnVline();
+ afx_msg void OnBnClickedBtnOut();
+ afx_msg void OnBnClickedBtnTmCt();
+ afx_msg void OnBnClickedBtnFun();
+ afx_msg void OnBnClickedBtnHLine();
+ afx_msg void OnBnClickedBtnNot();
+ afx_msg void OnBnClickedBtnIndex();
+ afx_msg void OnBnClickedBtnMc();
+ afx_msg void OnBnClickedBtnMce();
+
+ afx_msg void OnBnClickedBtnSet();
+ afx_msg void OnBnClickedBtnReset();
+ afx_msg void OnBnClickedBtnDf();
+ afx_msg void OnBnClickedBtnEnd();
+ afx_msg void OnBnClickedBtnCompare();
+ afx_msg void OnBnClickedBtnPFun();
+ afx_msg void OnBnClickedBtnUpDown();
+ afx_msg void OnBnClickedBtnBit();
+ afx_msg void OnBnClickedBtnWord();
+ afx_msg void OnBnClickedBtnInc1();
+ afx_msg void OnBnClickedBtnInc2();
+
+ afx_msg void OnBnClickedBtnPgConvert();
+ afx_msg void OnBnClickedBtnOnline();
+ afx_msg void OnBnClickedBtnOffline();
+ afx_msg void OnBnClickedBtnClose();
+ afx_msg void OnBnClickedBtnFind();
+ afx_msg void OnBnClickedBtnNextWin();
+ afx_msg void OnBnClickedBtnMonitor();
+ afx_msg void OnBnClickedBtnStatus();
+ afx_msg void OnBnClickedBtnRunProg();
+ afx_msg void OnBnClickedBtnPlcRead();
+ afx_msg void OnBnClickedBtnPlcWrite();
+
+ afx_msg void OnBnClickedBtnX();
+ afx_msg void OnBnClickedBtnY();
+ afx_msg void OnBnClickedBtnR();
+ afx_msg void OnBnClickedBtnL();
+ afx_msg void OnBnClickedBtnP();
+ afx_msg void OnBnClickedBtnCompare1();
+ afx_msg void OnBnClickedBtnT();
+ afx_msg void OnBnClickedBtnC();
+ afx_msg void OnBnClickedBtnE();
+
+ afx_msg void OnBnClickedBtnTmx();
+ afx_msg void OnBnClickedBtnTmy();
+ afx_msg void OnBnClickedBtnTmr();
+ afx_msg void OnBnClickedBtnTml();
+ afx_msg void OnBnClickedBtnCt();
+
+ afx_msg void OnBnClickedBtnD();
+ afx_msg void OnBnClickedBtnF();
+ afx_msg void OnBnClickedBtnNEQ();
+ afx_msg void OnBnClickedBtnGT();
+ afx_msg void OnBnClickedBtnLT();
};
--
Gitblit v1.9.1