From 3bf6df412c3b681e8901d6dcddd803a9c3235484 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 09 十二月 2024 08:52:34 +0800
Subject: [PATCH] 1.代码合并、消除警告；
---
SourceCode/Bond/BondEq/Common.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/Common.h b/SourceCode/Bond/BondEq/Common.h
index 6b4757c..8c949bd 100644
--- a/SourceCode/Bond/BondEq/Common.h
+++ b/SourceCode/Bond/BondEq/Common.h
@@ -4,9 +4,7 @@
#define MC_TIME_SEPAR 1000
-#define UNITA _T("UNITA")
-#define UNITB _T("UNITB")
-#define UNITC _T("C")
+#define UNIT1 _T("UNIT1")
/* Context Ret code */
@@ -32,7 +30,8 @@
#define RX_CODE_ALARM_EVENT 1012
#define RX_CODE_EQSTATE_EVENT 1013
#define RX_CODE_EFEM_STATUS_CHANGED 1014
-#define RX_CODE_EQ_STATE_CHANGED 1015
+#define RX_CODE_EQ_STATE_CHANGED 1015
+#define RX_CODE_SELECT_COMPONENT 1016
/* 广播代码 */
#define BC_CODE_DATA1_MATERIAL_RECEIVED 5000
@@ -74,6 +73,8 @@
#define TREE_BADGE2_BACKGROUND RGB(255, 127, 39)
#define TREE_BADGE2_FOREGROUND RGB(222, 222, 222)
#define HOMEPAGE_BACKGROUND RGB(252, 252, 255)
+#define COMPONENT_DLG_BACKGROUND RGB(252, 252, 255)
+#define COMPONENTS_PLC_BACKGROUND RGB(0, 252, 255)
/* 按钮颜色定义 风格1*/
@@ -88,6 +89,56 @@
#define BTN1_TEXT_FOCUS RGB(51, 51, 51)
#define BTN1_TEXT_DISABLE RGB(191, 191, 191)
+
+/* 轴设定页面颜色定义 */
+
+/* 5个按钮页, 按钮背景色，正常状态*/
+#define BTN_PAGE_FACE_NORMAL_COLOR RGB(0, 168, 0)
+#define BTN_PAGE_FACE_SELECT_COLOR RGB(0, 232, 0)
+#define BTN_PAGE_TEXT_NORMAL_COLOR RGB(22, 22, 22)
+#define BTN_PAGE_TEXT_SELECT_COLOR RGB(22, 22, 22)
+
+/* JOG+, JOG-*/
+#define BTN_JOG_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_JOG_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_JOG_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_JOG_BKGND_NORMAL RGB(0, 232, 0)
+#define BTN_JOG_BKGND_HOVER RGB(0, 222, 0)
+#define BTN_JOG_BKGND_PRESS RGB(0, 168, 0)
+
+/* Sev按钮 */
+#define BTN_SEV_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_SEV_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_SEV_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_SEV_BKGND_NORMAL RGB(0, 232, 0)
+#define BTN_SEV_BKGND_HOVER RGB(0, 222, 0)
+#define BTN_SEV_BKGND_PRESS RGB(222, 0, 0)
+
+/* Stop按钮 */
+#define BTN_STOP_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_STOP_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_STOP_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_STOP_BKGND_NORMAL RGB(0, 168, 0)
+#define BTN_STOP_BKGND_HOVER RGB(0, 138, 0)
+#define BTN_STOP_BKGND_PRESS RGB(222, 0, 0)
+
+/* OPR 按钮 */
+#define BTN_OPR_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_OPR_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_OPR_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_OPR_BKGND_NORMAL RGB(222, 222, 222)
+#define BTN_OPR_BKGND_HOVER RGB(208, 208, 222)
+#define BTN_OPR_BKGND_PRESS RGB(0, 232, 0)
+
+/* 定位按钮 */
+#define BTN_POINT_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_POINT_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_POINT_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_POINT_BKGND_NORMAL RGB(222, 222, 222)
+#define BTN_POINT_BKGND_HOVER RGB(208, 208, 222)
+#define BTN_POINT_BKGND_PRESS RGB(0, 232, 0)
+
+
/* 按钮id */
#define VIEW_TOOL_BTN_CLOSE 0x1016
--
Gitblit v1.9.3