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 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp index 28bbd95..8babfd8 100644 --- a/SourceCode/Bond/Servo/ServoDlg.cpp +++ b/SourceCode/Bond/Servo/ServoDlg.cpp @@ -224,12 +224,12 @@ SetMenu(&menu); - // Tab m_pPageGraph1 = new CPageGraph1(); m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this); 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); @@ -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