From 1bc4fecb9cc1641ed3ad0a2fda30766fc06fb13e Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 01 四月 2025 16:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.cpp | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index fdf1eba..28bbd95 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -218,7 +218,7 @@
SetIcon(m_hIcon, FALSE); // 设置小图标
- // 菜单
+ // 菜单
CMenu menu;
menu.LoadMenu(IDR_MENU_APP);
SetMenu(&menu);
@@ -234,8 +234,8 @@
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->AddItem("状态图", FALSE);
+ m_pTab->AddItem("连接图", TRUE);
m_pTab->SetCurSel(0);
m_pTab->SetBkgndColor(RGB(222, 222, 222));
ShowChildPage(0);
@@ -465,17 +465,11 @@
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);
}
- */
-
- SERVO::CLoadPort* pLoadPort1 =
- (SERVO::CLoadPort*)theApp.m_model.m_master.getEquipment(EQ_ID_LOADPORT1);
- pLoadPort1->outputPanel();
}
void CServoDlg::OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI)
--
Gitblit v1.9.3