From 2fb87c832d5ff07008308da1bab9b846b60ba7d3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 09 六月 2025 15:22:00 +0800
Subject: [PATCH] 1. 把搬运记录的界面添加到主界面的Tab页
---
SourceCode/Bond/Servo/ServoDlg.cpp | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 80117a5..c99cced 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -81,6 +81,7 @@
m_pPageGraph2 = nullptr;
m_pPageAlarm = nullptr;
m_pPageLog = nullptr;
+ m_pPageTransferLog = nullptr;
m_pPageRecipe = nullptr;
m_pTopToolbar = nullptr;
m_pMyStatusbar = nullptr;
@@ -174,6 +175,8 @@
else if (RX_CODE_MASTER_STATE_CHANGED == code) {
SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
if (state == SERVO::MASTERSTATE::READY) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_NORMAL);
m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
KillTimer(TIMER_ID_UPDATE_RUMTIME);
@@ -182,6 +185,8 @@
m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
}
else if (state == SERVO::MASTERSTATE::RUNNING) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_RUNNING);
m_pMyStatusbar->setForegroundColor(RGB(255, 255, 255));
SetTimer(TIMER_ID_UPDATE_RUMTIME, 500, nullptr);
@@ -207,6 +212,9 @@
}
}
else if (exCode == ROBOT_EVENT_FINISH) {
+ m_pMyStatusbar->setCurTaskBtnText("无");
+ }
+ else if (exCode == ROBOT_EVENT_ABORT) {
m_pMyStatusbar->setCurTaskBtnText("无");
}
}
@@ -283,6 +291,8 @@
m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
m_pPageLog = new CPageLog();
m_pPageLog->Create(IDD_DIALOG_LOG, this);
+ m_pPageTransferLog = new CPageTransferLog();
+ m_pPageTransferLog->Create(IDD_PAGE_TRANSFER_LOG, this);
CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
m_pTab->SetPaddingLeft(20);
@@ -292,6 +302,7 @@
m_pTab->AddItem("配方", TRUE);
m_pTab->AddItem("报警", TRUE);
m_pTab->AddItem("日志", TRUE);
+ m_pTab->AddItem("搬运", TRUE);
m_pTab->SetCurSel(0);
m_pTab->SetBkgndColor(RGB(222, 222, 222));
ShowChildPage(0);
@@ -632,6 +643,12 @@
m_pPageLog = nullptr;
}
+ if (m_pPageTransferLog != nullptr) {
+ m_pPageTransferLog->DestroyWindow();
+ delete m_pPageTransferLog;
+ m_pPageTransferLog = nullptr;
+ }
+
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
@@ -652,6 +669,7 @@
if (m_pPageRecipe == nullptr) return;
if (m_pPageAlarm == nullptr) return;
if (m_pPageLog == nullptr) return;
+ if (m_pPageTransferLog == nullptr) return;
Resize();
Invalidate();
@@ -706,6 +724,7 @@
m_pPageRecipe->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
m_pPageAlarm->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
m_pPageLog->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
+ m_pPageTransferLog->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
m_pMyStatusbar->MoveWindow(0, y2, rcClient.Width(), STATUSBAR_HEIGHT);
@@ -780,9 +799,9 @@
void CServoDlg::ShowChildPage(int index)
{
- ASSERT(0 <= index && index < 5);
- static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageRecipe, m_pPageAlarm, m_pPageLog };
- for (int i = 0; i < 5; i++) {
+ ASSERT(0 <= index && index < 6);
+ static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageRecipe, m_pPageAlarm, m_pPageLog, m_pPageTransferLog };
+ for (int i = 0; i < 6; i++) {
pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
}
}
@@ -793,11 +812,9 @@
if (id == IDC_BUTTON_RUN) {
theApp.m_model.getMaster().start();
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
- m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
}
else if (id == IDC_BUTTON_STOP) {
theApp.m_model.getMaster().stop();
- m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
}
else if (id == IDC_BUTTON_ROBOT) {
--
Gitblit v1.9.3