From dd67df95a7303aee3bed65ffa935465f20ee8b32 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期五, 22 七月 2022 15:19:55 +0800
Subject: [PATCH] merge from dev2

---
 MTerm2/MyDlgBarInputShow.h |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/MTerm2/MyDlgBarInputShow.h b/MTerm2/MyDlgBarInputShow.h
index de7c40e..fa24649 100644
--- a/MTerm2/MyDlgBarInputShow.h
+++ b/MTerm2/MyDlgBarInputShow.h
@@ -1,5 +1,6 @@
 锘�#pragma once
 
+#include "MTerm2View.h"
 
 // CMyDlgBarInputShow 瀵硅瘽妗�
 
@@ -15,9 +16,36 @@
 #ifdef AFX_DESIGN_TIME
 	enum { IDD = IDD_DIALOGBAR_INPUT_SHOW };
 #endif
-
+public:
+	struct tagInputCell
+	{
+		char OP= CMTerm2View::typeNO;
+		bool bnot=false;
+		bool bpp= false;
+		bool bpn = false;
+		bool bcmpEq = false;
+		bool bcmpLt = false;
+		bool bcmpGt = false;
+		bool bDouble = false;
+		bool bDouble1 = false;  //for  -||-D and -||- turn
+		bool bFloat = false;
+		bool bFloat1 = false;
+		bool bLeftLineUp = false;
+		bool brightLineUp = false;
+		int param=0;
+		CString num=_T("");
+	};
+	tagInputCell stInputCell;
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
-
+public:
+	
 	DECLARE_MESSAGE_MAP()
+public:
+	int SetDisplay(int inputInfo);
+	int SetDisplay1(int inputInfo);
+	int display(tagInputCell stDisplayCell);
+	void stInit();
+	CEdit m_edit_input;
+
 };

--
Gitblit v1.9.1