From 2c7d546ddcd43669a433a99e1901339e491542d9 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 24 七月 2025 16:38:27 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.cpp | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index de985ad..cec70de 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -241,6 +241,14 @@
}
}
}
+ else if (RX_CODE_LOADPORT_INUSE == code) {
+ SERVO::CLoadPort* pLoadPort = nullptr;
+ if (pAny->getPtrValue("ptr", (void*&)pLoadPort)) {
+ //CPortConfigurationDlg dlg;
+ //dlg.setCurSelPort(pLoadPort->getIndex());
+ //dlg.DoModal();
+ }
+ }
pAny->release();
}, [&]() -> void {
@@ -283,6 +291,10 @@
// 执行此操作
SetIcon(m_hIcon, TRUE); // 设置大图标
SetIcon(m_hIcon, FALSE); // 设置小图标
+
+
+ // model init
+ theApp.m_model.init();
// 菜单
@@ -353,9 +365,6 @@
int height = GetSystemMetrics(SM_CYSCREEN);
MoveWindow((width - rcWnd.Width()) / 2, 0, rcWnd.Width(), rcWnd.Height(), TRUE);
-
- // model init
- theApp.m_model.init();
SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
--
Gitblit v1.9.3