From cacea2da59a3acd73f3161d819a10e0060762616 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 06 五月 2025 14:54:13 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index cfc6034..8babfd8 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -218,11 +218,10 @@
SetIcon(m_hIcon, FALSE); // 设置小图标
- // 菜单
+ // 菜单
CMenu menu;
menu.LoadMenu(IDR_MENU_APP);
SetMenu(&menu);
-
// Tab
@@ -231,11 +230,12 @@
m_pPageGraph2 = new CPageGraph2();
m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
+
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);
@@ -249,7 +249,6 @@
m_pPanelAttributes = new CPanelAttributes();
m_pPanelAttributes->Create(IDD_PANEL_ATTRIBUTES, this);
-
// 调整初始窗口位置
CRect rcWnd;
@@ -275,6 +274,10 @@
theApp.m_model.m_master.init();
+ // 初始化master以后需要控件绑定数据
+ m_pPageGraph1->BindEquipmentToGraph();
+
+
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
}
--
Gitblit v1.9.3