From 2070871df480a664c9c4e38bc4e4e324682a64c6 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 16:12:28 +0800
Subject: [PATCH] 1. 解决 WebView2 控制器创建失败时闪退的问题 2. 解决连接图销毁时保存设备图形数据闪退的问题
---
SourceCode/Bond/Servo/ServoDlg.cpp | 535 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 288 insertions(+), 247 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 292467f..8babfd8 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -9,31 +9,16 @@
#include "Common.h"
#include "Log.h"
#include "SecsTestDlg.h"
+#include "AlarmDlg.h"
#include <chrono>
#include <thread>
#include <cmath>
+#include "HmTab.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#endif
-
-// Image
-#define IMAGE_ROBOT 2
-
-#define INDICATE_BONDER1 1
-#define INDICATE_BONDER2 2
-#define INDICATE_FLIPER 3
-#define INDICATE_ALIGNER 4
-#define INDICATE_LPORT4 5
-#define INDICATE_LPORT3 6
-#define INDICATE_LPORT2 7
-#define INDICATE_LPORT1 8
-#define INDICATE_ROBOT_ARM1 9
-#define INDICATE_ROBOT_ARM2 10
-#define INDICATE_VACUUM_BAKE 11
-#define INDICATE_BAKE_COOLING 12
-#define INDICATE_MEASUREMENT 13
/* 创建终端的定时器 */
@@ -84,16 +69,23 @@
m_crBkgnd = APPDLG_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
m_bShowLogWnd = FALSE;
- m_bIsRobotMoving = FALSE;
+ m_bShowAlarmWnd = FALSE;
m_pLogDlg = nullptr;
+ m_pAlarmDlg = nullptr;
m_pTerminalDisplayDlg = nullptr;
m_pObserver = nullptr;
+ m_pPanelMaster = nullptr;
+ m_pPanelEquipment = nullptr;
+ m_pPanelAttributes = nullptr;
+ m_pPageGraph1 = nullptr;
+ m_pPageGraph2 = 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)
@@ -108,6 +100,7 @@
ON_WM_SIZE()
ON_WM_CLOSE()
ON_MESSAGE(ID_MSG_LOGDLG_HIDE, &CServoDlg::OnLogDlgHide)
+ ON_MESSAGE(ID_MSG_ALARMDLG_HIDE, &CServoDlg::OnAlarmDlgHide)
ON_WM_MOVING()
ON_WM_MOVE()
ON_COMMAND(ID_MENU_FILE_EXIT, &CServoDlg::OnMenuFileExit)
@@ -118,10 +111,19 @@
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SECSTEST, &CServoDlg::OnUpdateMenuFileSecsTest)
ON_COMMAND(ID_MENU_WND_LOG, &CServoDlg::OnMenuWndLog)
ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
+ ON_COMMAND(ID_MENU_WND_ALARM, &CServoDlg::OnMenuWndAlarm)
+ ON_UPDATE_COMMAND_UI(ID_MENU_WND_ALARM, &CServoDlg::OnUpdateMenuWndAlarm)
+ ON_COMMAND(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnMenuTestMessageSet)
+ ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
+ ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
+ ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnUpdateMenuTestMessageClear)
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_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
+ ON_NOTIFY(BYHMTAB_SEL_CHANGED, IDC_TAB1, &CServoDlg::OnTabSelChanged)
END_MESSAGE_MAP()
@@ -144,6 +146,35 @@
ShowTerminalText(pszText);
}
}
+ else if (RX_CODE_SELECT_EQUIPMENT == code) {
+ SERVO::CEquipment* pEquipment = nullptr;
+ if (pAny->getPtrValue("ptr", (void*&)pEquipment)) {
+ ASSERT(pEquipment);
+ ASSERT(m_pPanelEquipment);
+ ASSERT(m_pPanelAttributes);
+ m_pPanelEquipment->loadDataFromEquipment(pEquipment);
+ m_pPanelAttributes->ShowWindow(SW_HIDE);
+ if (!m_pPanelEquipment->IsWindowVisible()) {
+ m_pPanelEquipment->ShowWindow(SW_SHOW);
+ Resize();
+ }
+ }
+ }
+ else if (RX_CODE_SELECT_STEP == code) {
+ SERVO::CStep* pStep = nullptr;
+ if (pAny->getPtrValue("ptr", (void*&)pStep)) {
+ ASSERT(pStep);
+ ASSERT(m_pPanelEquipment);
+ ASSERT(m_pPanelAttributes);
+ m_pPanelEquipment->ShowWindow(SW_HIDE);
+ m_pPanelAttributes->loadDataFromStep(pStep);
+ if (!m_pPanelAttributes->IsWindowVisible()) {
+ m_pPanelAttributes->ShowWindow(SW_SHOW);
+ Resize();
+ }
+ }
+ }
+
pAny->release();
}, [&]() -> void {
// onComplete
@@ -187,94 +218,37 @@
SetIcon(m_hIcon, FALSE); // 设置小图标
- // 菜单
+ // 菜单
CMenu menu;
menu.LoadMenu(IDR_MENU_APP);
SetMenu(&menu);
-
- // 图示
- m_pGraph = CServoGraph::Hook(GetDlgItem(IDC_SERVO_GRAPH1)->GetSafeHwnd());
- CString strPath;
- strPath.Format(_T("%s\\res\\Servo001.bmp"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
- m_pGraph->AddImage(1, (LPTSTR)(LPCTSTR)strPath, 0, 0);
-
- strPath.Format(_T("%s\\res\\Robot001.bmp"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
- m_pGraph->AddImage(IMAGE_ROBOT, (LPTSTR)(LPCTSTR)strPath, 170, 270);
-
- // 添加指示器
- // Bonder
- m_pGraph->AddIndicateBox(INDICATE_BONDER1, 220, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_BONDER1, "10", "Bonder 1");
- m_pGraph->AddIndicateBox(INDICATE_BONDER2, 220, 516, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_BONDER2, "11", "Bonder 2");
+ // Tab
+ m_pPageGraph1 = new CPageGraph1();
+ m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
+ m_pPageGraph2 = new CPageGraph2();
+ m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
- // 翻转
- m_pGraph->AddIndicateBox(INDICATE_FLIPER, 338, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_FLIPER, "8", "Fliper");
+ CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
+ m_pTab->SetPaddingLeft(20);
+ m_pTab->SetItemMarginLeft(18);
+ m_pTab->AddItem("状态图", FALSE);
+ m_pTab->AddItem("连接图", TRUE);
+ m_pTab->SetCurSel(0);
+ m_pTab->SetBkgndColor(RGB(222, 222, 222));
+ ShowChildPage(0);
- // 对位
- m_pGraph->AddIndicateBox(INDICATE_ALIGNER, 428, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_ALIGNER, "7", "Aligner");
-
-
- // Load port 4
- m_pGraph->AddIndicateBox(INDICATE_LPORT4, 518, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_LPORT4, "4", "LPort4");
-
-
- // Load port 3
- m_pGraph->AddIndicateBox(INDICATE_LPORT3, 606, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_LPORT3, "3", "LPort3");
-
-
- // Load port 2
- m_pGraph->AddIndicateBox(INDICATE_LPORT2, 690, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_LPORT2, "2", "LPort2");
-
-
- // Load port 1
- m_pGraph->AddIndicateBox(INDICATE_LPORT1, 774, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_LPORT1, "1", "LPort1");
-
-
- // Robot
- m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM1, 190, 294, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "5", "Robot");
- m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM2, 243, 294, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- 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));
- m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "9", "Vacuum bake");
-
-
- // Bake cooling
- m_pGraph->AddIndicateBox(INDICATE_BAKE_COOLING, 566, 516, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "12", "Bake cooling");
-
-
- // Bake cooling
- m_pGraph->AddIndicateBox(INDICATE_MEASUREMENT, 736, 516, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
- m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");
-
+ m_pPanelMaster = new CPanelMaster();
+ m_pPanelMaster->Create(IDD_PANEL_MASTER, this);
+ m_pPanelMaster->ShowWindow(SW_SHOW);
+ m_pPanelEquipment = new CPanelEquipment();
+ m_pPanelEquipment->Create(IDD_PANEL_EQUIPMENT, this);
+ m_pPanelAttributes = new CPanelAttributes();
+ m_pPanelAttributes->Create(IDD_PANEL_ATTRIBUTES, this);
+
// 调整初始窗口位置
CRect rcWnd;
@@ -292,11 +266,16 @@
InitRxWindows();
OnBnClickedButtonLog();
UpdateLogBtn();
+ UpdateAlarmBtn();
Resize();
// 相当于延时调用master的初始化
theApp.m_model.m_master.init();
+
+
+ // 初始化master以后需要控件绑定数据
+ m_pPageGraph1->BindEquipmentToGraph();
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -453,12 +432,50 @@
pCmdUI->SetCheck(m_bShowLogWnd);
}
+void CServoDlg::OnMenuWndAlarm()
+{
+ OnBnClickedButtonAlarm();
+}
+
+void CServoDlg::OnUpdateMenuWndAlarm(CCmdUI* pCmdUI)
+{
+ pCmdUI->SetCheck(m_bShowAlarmWnd);
+}
+
void CServoDlg::OnMenuFileExit()
{
PostMessage(WM_CLOSE);
}
void CServoDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuTestMessageSet()
+{
+ SERVO::CEquipment* pEquipment = m_pPanelMaster->GetActiveEquipment();
+ if (pEquipment != nullptr) {
+ SERVO::CEqCimMessageCmdStep* pStep = (SERVO::CEqCimMessageCmdStep*)pEquipment->getStepWithName(STEP_CIM_MESSAGE_CMD);
+ pStep->setCimMessage("HELLO 5007", 2, 3);
+ }
+}
+
+void CServoDlg::OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(m_pPanelMaster->GetActiveEquipment() != nullptr);
+}
+
+void CServoDlg::OnMenuTestMessageClear()
+{
+ SERVO::CEquipment* pEquipment = m_pPanelMaster->GetActiveEquipment();
+ if (pEquipment != nullptr) {
+ SERVO::CEqCimMessageClearStep* pStep = (SERVO::CEqCimMessageClearStep*)pEquipment->getStepWithName(STEP_CIM_MESSAGE_CLEAR);
+ pStep->clearCimMessage(2, 3);
+ }
+}
+
+void CServoDlg::OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI)
{
pCmdUI->Enable(TRUE);
}
@@ -507,10 +524,47 @@
delete m_pLogDlg;
m_pLogDlg = nullptr;
}
+
+ if (m_pAlarmDlg != nullptr) {
+ m_pAlarmDlg->DestroyWindow();
+ delete m_pAlarmDlg;
+ m_pAlarmDlg = 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_pPanelEquipment != nullptr) {
+ m_pPanelEquipment->DestroyWindow();
+ delete m_pPanelEquipment;
+ m_pPanelEquipment = nullptr;
+ }
+
+ if (m_pPanelAttributes != nullptr) {
+ m_pPanelAttributes->DestroyWindow();
+ delete m_pPanelAttributes;
+ m_pPanelAttributes = nullptr;
+ }
+
+ if (m_pPageGraph1 != nullptr) {
+ m_pPageGraph1->DestroyWindow();
+ delete m_pPageGraph1;
+ m_pPageGraph1 = nullptr;
+ }
+
+ if (m_pPageGraph2 != nullptr) {
+ m_pPageGraph2->DestroyWindow();
+ delete m_pPageGraph2;
+ m_pPageGraph2 = nullptr;
}
if (m_hbrBkgnd != nullptr) {
@@ -524,20 +578,61 @@
}
+void CServoDlg::OnBnClickedButtonAlarm()
+{
+ m_bShowAlarmWnd = !m_bShowAlarmWnd;
+
+ // 如果要显示报警窗口，则隐藏日志窗口
+ if (m_bShowLogWnd) {
+ m_bShowLogWnd = false;
+ if (m_pLogDlg != nullptr) {
+ m_pLogDlg->ShowWindow(SW_HIDE);
+ UpdateLogBtn();
+ }
+ }
+
+ if (m_pAlarmDlg == nullptr) {
+ m_pAlarmDlg = new CAlarmDlg();
+ m_pAlarmDlg->Create(IDD_DIALOG_ALARM, this);
+
+ CRect rcWnd;
+ GetWindowRect(&rcWnd);
+ int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
+ if (nHeight < 280) nHeight = 280;
+ m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
+ }
+ ASSERT(m_pAlarmDlg);
+ m_pAlarmDlg->ShowWindow(m_bShowAlarmWnd ? SW_SHOW : SW_HIDE);
+
+ UpdateAlarmBtn();
+}
+
void CServoDlg::OnBnClickedButtonLog()
{
m_bShowLogWnd = !m_bShowLogWnd;
+
+ // 如果要显示日志窗口，则隐藏报警窗口
+ if (m_bShowLogWnd) {
+ m_bShowAlarmWnd = false;
+ if (m_pAlarmDlg != nullptr) {
+ m_pAlarmDlg->ShowWindow(SW_HIDE);
+ UpdateAlarmBtn();
+ }
+ }
+
if (m_pLogDlg == nullptr) {
m_pLogDlg = new CLogDlg();
m_pLogDlg->Create(IDD_DIALOG_LOG, this);
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
+ if (nHeight < 280) nHeight = 280;
+ m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
}
ASSERT(m_pLogDlg);
m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);
-
+
UpdateLogBtn();
}
@@ -552,143 +647,26 @@
m_btnLog.Invalidate();
}
-void CServoDlg::UpdateRobotPosition(float percentage)
+void CServoDlg::UpdateAlarmBtn()
{
- // 限制百分比范围在 [0, 1] 之间
- if (percentage < 0.0f) percentage = 0.0f;
- if (percentage > 1.0f) percentage = 1.0f;
-
- // 根据百分比计算目标 X 坐标
- int startX = m_pGraph->GetImage(IMAGE_ROBOT)->x;
- int endX = static_cast<int>(170 + percentage * (700 - 170));
-
- int arm1Offset = 20; // 从图片到ARM1的偏移
- int arm2Offset = 73; // 从图片到ARM2的偏移
-
- // 计算移动所需的时间
- int distance = abs(endX - startX);
- int duration = static_cast<int>((distance / 100.0) * 1000);
-
- auto startTime = std::chrono::steady_clock::now();
- auto endTime = startTime + std::chrono::milliseconds(duration);
-
- // 开始移动，设置标记
- m_bIsRobotMoving = TRUE;
-
- // 开始平滑移动
- while (std::chrono::steady_clock::now() < endTime) {
- auto currentTime = std::chrono::steady_clock::now();
- float progress = std::chrono::duration<float, std::milli>(currentTime - startTime).count() / duration;
- progress = min(progress, 1.0f);
-
- // 根据进度计算当前位置
- int currentX = static_cast<int>(startX + progress * (endX - startX));
- m_pGraph->UpdateImageCoordinates(IMAGE_ROBOT, currentX, 270);
- m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM1, currentX + arm1Offset, 294);
- m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM2, currentX + arm2Offset, 294);
-
- // 刷新界面
- Invalidate();
- UpdateWindow();
-
- // 控制帧率约为 60 FPS
- std::this_thread::sleep_for(std::chrono::milliseconds(16));
- }
-
- // 确保最后位置精确到目标位置
- m_pGraph->UpdateImageCoordinates(IMAGE_ROBOT, endX, 270);
- m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM1, endX + arm1Offset, 294);
- m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM2, endX + arm2Offset, 294);
-
- // 界面重绘
- Invalidate();
-
- // 动画结束，设置标记
- m_bIsRobotMoving = FALSE;
-}
-
-void CServoDlg::RotateRobot(float angleInDegrees)
-{
- // 将角度转换为弧度
- float angleInRadians = static_cast<float>(std::acos(-1)) / 180.0f * angleInDegrees;
-
- // 获取机器人图片的当前坐标和中心
- auto* pImage = m_pGraph->GetImage(IMAGE_ROBOT);
- if (!pImage) return;
-
- // 更新 Rotate 图片的角度，确保角度保持在 [0, 360) 范围内
- m_pGraph->UpdateImageAngle(IMAGE_ROBOT, static_cast<float>(fmod(pImage->angle + angleInDegrees + 360, 360)));
-
- int cx = pImage->x + pImage->bmWidth / 2; // 图片中心 X
- int cy = pImage->y + pImage->bmHeight / 2; // 图片中心 Y
-
- // 旋转指示框的坐标
- auto* pRobot1 = m_pGraph->GetIndicateBox(INDICATE_ROBOT_ARM1);
- auto* pRobot2 = m_pGraph->GetIndicateBox(INDICATE_ROBOT_ARM2);
-
- if (pRobot1 && pRobot2) {
- int newArmX1 = pImage->x + 20;
- int newArmY1 = 294;
-
- int newArmX2 = pImage->x + 73;
- int newArmY2 = 294;
-
- if (angleInDegrees != 0.0f) {
- // 计算指示框1的新坐标
- newArmX1 = static_cast<int>(cx + (pRobot1->x - cx) * cos(angleInRadians) - (pRobot1->y - cy) * sin(angleInRadians));
- newArmY1 = static_cast<int>(cy + (pRobot1->x - cx) * sin(angleInRadians) + (pRobot1->y - cy) * cos(angleInRadians));
-
- // 计算指示框2的新坐标
- newArmX2 = static_cast<int>(cx + (pRobot2->x - cx) * cos(angleInRadians) - (pRobot2->y - cy) * sin(angleInRadians));
- newArmY2 = static_cast<int>(cy + (pRobot2->x - cx) * sin(angleInRadians) + (pRobot2->y - cy) * cos(angleInRadians));
- }
-
- // 更新指示框的位置
- m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM1, newArmX1, newArmY1);
- m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM2, newArmX2, newArmY2);
- }
-
- // 强制重绘界面
- Invalidate();
-}
-
-void CServoDlg::UpdateDeviceStatus(int id, DeviceStatus status)
-{
- // 根据状态设置颜色
- COLORREF newBackgroundColor;
- COLORREF newFrameColor1;
- COLORREF newFrameColor2;
-
- switch (status) {
- case Online:
- newBackgroundColor = RGB(255, 0, 0);
- newFrameColor1 = RGB(22, 22, 22);
- newFrameColor2 = RGB(255, 127, 39);
- break;
- case Offline:
- newBackgroundColor = RGB(0, 255, 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();
+ 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::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
- if (GetDlgItem(IDC_SERVO_GRAPH1) == nullptr) return;
+ if (GetDlgItem(IDC_TAB1) == nullptr) return;
+ if (m_pPageGraph1 == nullptr) return;
+ if (m_pPageGraph2 == nullptr) return;
+
Resize();
+ Invalidate();
}
void CServoDlg::Resize()
@@ -696,19 +674,51 @@
CRect rcClient, rcItem;
CWnd* pItem = nullptr;
int x, y;
+ GetClientRect(&rcClient);
x = 0;
y = 0;
- pItem = GetDlgItem(IDC_SERVO_GRAPH1);
- pItem->GetClientRect(&rcItem);
- pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
- y += rcItem.Height();
- y += 8;
+ int nPanelWidth = 0;
+ if (m_pPanelMaster != nullptr) {
+ nPanelWidth = m_pPanelMaster->getPanelWidth();
+ m_pPanelMaster->MoveWindow(x, y, nPanelWidth, rcClient.Height());
+ x += nPanelWidth;
+ }
- x = 8;
+ if (m_pPanelEquipment != nullptr && m_pPanelEquipment->IsWindowVisible()) {
+ nPanelWidth = m_pPanelEquipment->getPanelWidth();
+ m_pPanelEquipment->MoveWindow(x, y, nPanelWidth, rcClient.Height());
+ x += nPanelWidth;
+ }
+
+ if (m_pPanelAttributes != nullptr && m_pPanelAttributes->IsWindowVisible()) {
+ nPanelWidth = m_pPanelAttributes->getPanelWidth();
+ m_pPanelAttributes->MoveWindow(x, y, nPanelWidth, rcClient.Height());
+ x += nPanelWidth;
+ }
+
+
+ pItem = GetDlgItem(IDC_TAB1);
+ pItem->GetWindowRect(rcItem);
+ pItem->MoveWindow(x, y, rcClient.Width() - x, rcItem.Height());
+ y += rcItem.Height();
+
+
+ m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
+ m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
+
+
+ x = rcClient.right - 8;
pItem = GetDlgItem(IDC_BUTTON_LOG);
pItem->GetClientRect(&rcItem);
- pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
+ x -= rcItem.Width();
+ pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ x -= 8;
+
+ pItem = GetDlgItem(IDC_BUTTON_ALARM);
+ pItem->GetClientRect(&rcItem);
+ x -= rcItem.Width();
+ pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
}
void CServoDlg::OnClose()
@@ -735,6 +745,15 @@
return 0;
}
+LRESULT CServoDlg::OnAlarmDlgHide(WPARAM wParam, LPARAM lParam)
+{
+ m_bShowAlarmWnd = FALSE;
+ UpdateAlarmBtn();
+ LOGE("OnAlarmDlgHide");
+
+ return 0;
+}
+
void CServoDlg::OnMoving(UINT fwSide, LPRECT pRect)
{
CDialogEx::OnMoving(fwSide, pRect);
@@ -745,7 +764,13 @@
if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ m_pLogDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
+ }
+
+ if (m_pAlarmDlg != nullptr && !m_pAlarmDlg->IsZoomed()) {
+ CRect rcWnd;
+ GetWindowRect(&rcWnd);
+ m_pAlarmDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
}
CDialogEx::OnMove(x, y);
@@ -772,14 +797,30 @@
CDialogEx::OnTimer(nIDEvent);
}
-
-BOOL CServoDlg::OnEraseBkgnd(CDC* pDC)
+LRESULT CServoDlg::OnPanelResize(WPARAM wParam, LPARAM lParam)
{
- // TODO: 在此添加消息处理程序代码和/或调用默认值
- if (m_bIsRobotMoving) {
- // 禁止刷新背景，避免闪烁
- return TRUE;
- }
-
- return CDialogEx::OnEraseBkgnd(pDC);
+ int width = wParam;
+ // m_pPanel->SetPanelWidth(width);
+ Resize();
+
+ return 0;
}
+
+void CServoDlg::OnTabSelChanged(NMHDR* nmhdr, LRESULT* result)
+{
+ BYHMTAB_NMHDR* pNmhdrex = (BYHMTAB_NMHDR*)nmhdr;
+ ShowChildPage((int)pNmhdrex->dwData);
+
+ *result = 0;
+}
+
+void CServoDlg::ShowChildPage(int index)
+{
+ ASSERT(0 <= index && index < 3);
+ static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2 };
+ for (int i = 0; i < 2; i++) {
+ pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
+ }
+}
+
+
--
Gitblit v1.9.3