From bf55b2f3083cbfdeb83611b2fa2dd552bf5b0775 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 03 三月 2025 16:20:00 +0800
Subject: [PATCH] 1.开始处理Step属性值； 2.增加左侧master面板；
---
SourceCode/Bond/Servo/ServoDlg.cpp | 222 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 220 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index f349071..4217090 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -9,7 +9,7 @@
#include "Common.h"
#include "Log.h"
#include "SecsTestDlg.h"
-#include "AlarmManager.h"
+#include "AlarmDlg.h"
#include <chrono>
#include <thread>
#include <cmath>
@@ -35,6 +35,10 @@
#define INDICATE_VACUUM_BAKE 11
#define INDICATE_BAKE_COOLING 12
#define INDICATE_MEASUREMENT 13
+
+
+/* 创建终端的定时器 */
+#define TIMER_ID_CREATE_TERMINAL 1
// 用于应用程序“关于”菜单项的 CAboutDlg 对话框
@@ -81,14 +85,19 @@
m_crBkgnd = APPDLG_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
m_bShowLogWnd = FALSE;
+ m_bShowAlarmWnd = FALSE;
m_bIsRobotMoving = FALSE;
m_pLogDlg = nullptr;
+ m_pTerminalDisplayDlg = nullptr;
+ m_pObserver = nullptr;
+ m_pPanelMaster = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
+ DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
}
BEGIN_MESSAGE_MAP(CServoDlg, CDialogEx)
@@ -115,11 +124,61 @@
ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
ON_WM_INITMENUPOPUP()
+ ON_WM_TIMER()
ON_WM_ERASEBKGND()
+ ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
+ ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
+ ON_NOTIFY(BYSERVOGRAPH_ITEM_CLICKED, IDC_SERVO_GRAPH1, &CServoDlg::OnGraphItemClicked)
+ ON_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
END_MESSAGE_MAP()
// CServoDlg 消息处理程序
+
+void CServoDlg::InitRxWindows()
+{
+ /* code */
+ // 订阅数据
+ IRxWindows* pRxWindows = RX_GetRxWindows();
+ pRxWindows->enableLog(5);
+ if (m_pObserver == NULL) {
+ m_pObserver = pRxWindows->allocObserver([&](IAny* pAny) -> void {
+ // onNext
+ pAny->addRef();
+ int code = pAny->getCode();
+ if (RX_HSMS_TERMINAL_TEXT == code) {
+ const char* pszText;
+ if (pAny->getStringValue("text", pszText)) {
+ ShowTerminalText(pszText);
+ }
+ }
+ else if (RX_CODE_EQ_ALIVE == code) {
+ // 通知设备状态
+ SERVO::CEquipment* pEquipment = nullptr;
+ if (pAny->getPtrValue("ptr", (void*&)pEquipment)) {
+ if (pEquipment != nullptr) {
+ int nID = pEquipment->getID();
+ BOOL bAlive = pEquipment->isAlive();
+ if (EQ_ID_EFEM == nID) {
+ DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
+ UpdateDeviceStatus(INDICATE_ROBOT_ARM1, status);
+ UpdateDeviceStatus(INDICATE_ROBOT_ARM2, status);
+ }
+ }
+ }
+ }
+ pAny->release();
+ }, [&]() -> void {
+ // onComplete
+ }, [&](IThrowable* pThrowable) -> void {
+ // onErrorm
+ pThrowable->printf();
+ });
+
+ theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())
+ ->subscribe(m_pObserver);
+ }
+}
BOOL CServoDlg::OnInitDialog()
{
@@ -222,6 +281,8 @@
m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "6", "Robot");
+
+
// Vacuum bake
m_pGraph->AddIndicateBox(INDICATE_VACUUM_BAKE, 396, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), RGB(0, 176, 80));
@@ -240,6 +301,12 @@
m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");
+
+ m_pPanelMaster = new CPanelMaster();
+ m_pPanelMaster->Create(IDD_PANEL_MASTER, this);
+ m_pPanelMaster->ShowWindow(SW_SHOW);
+
+
// 调整初始窗口位置
CRect rcWnd;
GetWindowRect(&rcWnd);
@@ -252,8 +319,25 @@
theApp.m_model.init();
+ SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
+ InitRxWindows();
+ OnBnClickedButtonLog();
UpdateLogBtn();
+ UpdateAlarmBtn();
Resize();
+
+
+ // 相当于延时调用master的初始化
+ theApp.m_model.m_master.init();
+
+
+ // 绑定数据
+ {
+ SERVO::CEquipment* pEquipment = theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
+ m_pGraph->SetIndicateBoxData(INDICATE_ROBOT_ARM1, pEquipment);
+ }
+
+
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
}
@@ -462,10 +546,27 @@
delete m_pLogDlg;
m_pLogDlg = nullptr;
}
+ if (m_pTerminalDisplayDlg != nullptr) {
+ m_pTerminalDisplayDlg->DestroyWindow();
+ delete m_pTerminalDisplayDlg;
+ m_pTerminalDisplayDlg = nullptr;
+ }
+
+ if (m_pPanelMaster != nullptr) {
+ m_pPanelMaster->DestroyWindow();
+ delete m_pPanelMaster;
+ m_pPanelMaster = nullptr;
+ }
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
+
+ if (m_pObserver != nullptr) {
+ m_pObserver->unsubscribe();
+ m_pObserver = NULL;
+ }
+
}
void CServoDlg::OnBnClickedButtonLog()
@@ -494,6 +595,17 @@
m_btnLog.SetBkgndColor(BS_HOVER, BTN_LOG_BKGND_HOVER);
m_btnLog.SetBkgndColor(BS_PRESS, BTN_LOG_BKGND_PRESS);
m_btnLog.Invalidate();
+}
+
+void CServoDlg::UpdateAlarmBtn()
+{
+ m_btnAlarm.SetFrameColor(BS_NORMAL, BTN_ALARM_FRAME_NORMAL);
+ m_btnAlarm.SetFrameColor(BS_HOVER, BTN_ALARM_FRAME_HOVER);
+ m_btnAlarm.SetFrameColor(BS_PRESS, BTN_ALARM_FRAME_PRESS);
+ m_btnAlarm.SetBkgndColor(BS_NORMAL, m_bShowAlarmWnd ? BTN_ALARM_BKGND_PRESS : BTN_ALARM_BKGND_NORMAL);
+ m_btnAlarm.SetBkgndColor(BS_HOVER, BTN_ALARM_BKGND_HOVER);
+ m_btnAlarm.SetBkgndColor(BS_PRESS, BTN_ALARM_BKGND_PRESS);
+ m_btnAlarm.Invalidate();
}
void CServoDlg::UpdateRobotPosition(float percentage)
@@ -596,6 +708,38 @@
Invalidate();
}
+void CServoDlg::UpdateDeviceStatus(int id, DeviceStatus status)
+{
+ // 根据状态设置颜色
+ COLORREF newBackgroundColor;
+ COLORREF newFrameColor1;
+ COLORREF newFrameColor2;
+
+ switch (status) {
+ case ONLINE:
+ newBackgroundColor = RGB(0, 255, 0);
+ newFrameColor1 = RGB(22, 22, 22);
+ newFrameColor2 = RGB(255, 127, 39);
+ break;
+ case OFFLINE:
+ newBackgroundColor = RGB(255, 0, 0);
+ newFrameColor1 = RGB(22, 22, 22);
+ newFrameColor2 = RGB(255, 127, 39);
+ break;
+ default:
+ newBackgroundColor = RGB(255, 255, 255); // 默认白色背景
+ newFrameColor1 = RGB(0, 0, 0); // 默认黑色框架1
+ newFrameColor2 = RGB(0, 0, 0); // 默认黑色框架2
+ break;
+ }
+
+ m_pGraph->UpdateIndicateBox1Colors(id, newBackgroundColor, newFrameColor1, newFrameColor2);
+
+ // 刷新界面
+ Invalidate();
+ UpdateWindow();
+}
+
void CServoDlg::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
@@ -608,9 +752,18 @@
CRect rcClient, rcItem;
CWnd* pItem = nullptr;
int x, y;
+ GetClientRect(&rcClient);
x = 0;
y = 0;
+ int nPanelWidth = 0;
+ if (m_pPanelMaster != nullptr) {
+ nPanelWidth = m_pPanelMaster->getPanelWidth();
+ m_pPanelMaster->MoveWindow(x, y, nPanelWidth, rcClient.Height());
+ x += nPanelWidth;
+ }
+
+
pItem = GetDlgItem(IDC_SERVO_GRAPH1);
pItem->GetClientRect(&rcItem);
pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
@@ -620,7 +773,12 @@
x = 8;
pItem = GetDlgItem(IDC_BUTTON_LOG);
pItem->GetClientRect(&rcItem);
- pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
+ pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+
+ x = 20 + rcItem.Width();
+ pItem = GetDlgItem(IDC_BUTTON_ALARM);
+ pItem->GetClientRect(&rcItem);
+ pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
}
void CServoDlg::OnClose()
@@ -635,6 +793,14 @@
m_bShowLogWnd = FALSE;
UpdateLogBtn();
LOGE("OnLogDlgHide");
+
+ unsigned int DATAID, RPTID;
+ DATAID = 111;
+ RPTID = 1001;
+ std::vector<std::string> v;
+ v.push_back("abc");
+ v.push_back("def");
+ theApp.m_model.m_hsmsPassive.requestEventReportSend(DATAID, RPTID, v);
return 0;
}
@@ -655,6 +821,27 @@
CDialogEx::OnMove(x, y);
}
+void CServoDlg::ShowTerminalText(const char* pszText, unsigned int duration/* = -1*/)
+{
+ ASSERT(m_pTerminalDisplayDlg);
+ m_pTerminalDisplayDlg->ShowText(pszText, duration);
+}
+
+void CServoDlg::OnTimer(UINT_PTR nIDEvent)
+{
+ if (TIMER_ID_CREATE_TERMINAL == nIDEvent) {
+ // 预先创建终端窗口
+ KillTimer(TIMER_ID_CREATE_TERMINAL);
+ char szBuffer[MAX_PATH];
+ sprintf_s(szBuffer, MAX_PATH, "%s\\RES\\TeminalMsg.html", (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ m_pTerminalDisplayDlg = new CTerminalDisplayDlg();
+ m_pTerminalDisplayDlg->SetTemplateHtml(szBuffer);
+ m_pTerminalDisplayDlg->Create(IDD_DIALOG_TERMINAL_DISPLAY, this);
+ }
+
+ CDialogEx::OnTimer(nIDEvent);
+}
+
BOOL CServoDlg::OnEraseBkgnd(CDC* pDC)
{
@@ -666,3 +853,34 @@
return CDialogEx::OnEraseBkgnd(pDC);
}
+
+
+void CServoDlg::OnBnClickedButtonAlarm()
+{
+ // TODO: 在此添加控件通知处理程序代码
+ CAlarmDlg dlg;
+ dlg.DoModal();
+}
+
+void CServoDlg::OnGraphItemClicked(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ BYSERVOGRAPH_NMHDR* pGraphNmhdr = reinterpret_cast<BYSERVOGRAPH_NMHDR*>(pNMHDR);
+ CString s; s.Format(_T("OnGraphItemClicked %d"), pGraphNmhdr->dwData);
+ SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)m_pGraph->GetIndicateBoxData(pGraphNmhdr->dwData);
+ if (pEquipment != nullptr) {
+ AfxMessageBox(pEquipment->getName().c_str());
+ }
+
+
+ *pResult = 0;
+}
+
+LRESULT CServoDlg::OnPanelResize(WPARAM wParam, LPARAM lParam)
+{
+ int width = wParam;
+ // m_pPanel->SetPanelWidth(width);
+ Resize();
+
+ return 0;
+}
+
--
Gitblit v1.9.3