From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/TopToolbar.cpp | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/TopToolbar.cpp b/SourceCode/Bond/Servo/TopToolbar.cpp
index 32c9d8a..4b7755e 100644
--- a/SourceCode/Bond/Servo/TopToolbar.cpp
+++ b/SourceCode/Bond/Servo/TopToolbar.cpp
@@ -8,6 +8,9 @@
#include "Common.h"
+#define SHOW_BATCH 1
+#define SHOW_CT 1
+
// CTopToolbar 对话框
IMPLEMENT_DYNAMIC(CTopToolbar, CDialogEx)
@@ -27,9 +30,13 @@
{
CDialogEx::DoDataExchange(pDX);
DDX_Control(pDX, IDC_BUTTON_RUN, m_btnRun);
+ DDX_Control(pDX, IDC_BUTTON_RUN_BATCH, m_btnRunBatch);
+ DDX_Control(pDX, IDC_BUTTON_RUN_CT, m_btnRunCt);
DDX_Control(pDX, IDC_BUTTON_STOP, m_btnStop);
+ DDX_Control(pDX, IDC_BUTTON_JOBS, m_btnCJobs);
DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings);
+ DDX_Control(pDX, IDC_BUTTON_PORT_CONFIG, m_btnPortConfig);
DDX_Control(pDX, IDC_BUTTON_ROBOT, m_btnRobot);
DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator);
}
@@ -51,10 +58,14 @@
CDialogEx::OnInitDialog();
InitBtn(m_btnRun, "Run_High_32.ico", "Run_Gray_32.ico");
+ InitBtn(m_btnRunBatch, "Run_High_32.ico", "Run_Gray_32.ico");
+ InitBtn(m_btnRunCt, "RunCt_High_32.ico", "RunCt_Gray_32.ico");
InitBtn(m_btnStop, "Stop_High_32.ico", "Stop_Gray_32.ico");
InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_gray_32.ico");
+ InitBtn(m_btnCJobs, "ControlJob_High_32.ico", "ControlJob_Gray_32.ico");
InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico");
InitBtn(m_btnRobot, "Robot_High_32.ico", "Robot_Gray_32.ico");
+ InitBtn(m_btnPortConfig, "PortConfig_High_32.ico", "PortConfig_Gray_32.ico");
InitBtn(m_btnOperator, "Operator_High_32.ico", "Operator_Gray_32.ico");
HMENU hMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCEA(IDR_MENU_OPEATOR));
m_btnOperator.SetMenu(hMenu);
@@ -114,7 +125,26 @@
x += BTN_WIDTH;
x += 2;
+#ifdef SHOW_BATCH
+ pItem = GetDlgItem(IDC_BUTTON_RUN_BATCH);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+#endif
+
+#ifdef SHOW_CT
+ pItem = GetDlgItem(IDC_BUTTON_RUN_CT);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+#endif
+
pItem = GetDlgItem(IDC_BUTTON_STOP);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+
+ pItem = GetDlgItem(IDC_BUTTON_JOBS);
pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
x += BTN_WIDTH;
x += 2;
@@ -129,6 +159,11 @@
x += 4;
pItem = GetDlgItem(IDC_BUTTON_SETTINGS);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+
+ pItem = GetDlgItem(IDC_BUTTON_PORT_CONFIG);
pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
x += BTN_WIDTH;
x += 2;
@@ -183,9 +218,13 @@
{
switch (LOWORD(wParam)) {
case IDC_BUTTON_RUN:
+ case IDC_BUTTON_RUN_BATCH:
+ case IDC_BUTTON_RUN_CT:
case IDC_BUTTON_STOP:
+ case IDC_BUTTON_JOBS:
case IDC_BUTTON_ALARM:
case IDC_BUTTON_SETTINGS:
+ case IDC_BUTTON_PORT_CONFIG:
case IDC_BUTTON_ROBOT:
GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam));
break;
--
Gitblit v1.9.3