From 60e4e45bee9bb45c20dd2d25631efaca69980c20 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 14 十一月 2024 17:44:12 +0800
Subject: [PATCH] 1. 添加Axis设定界面
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 63621f8..eb1cde7 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -12,6 +12,9 @@
#include "UserManager.h"
#include "LoginDlg.h"
+// test
+#include "AxisSettingsDlg.h"
+
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -212,7 +215,6 @@
// Home页
m_pHomeDialog = CreateHomeDlg();
ShowWindow(SW_SHOWMAXIMIZED);
- SetTimer(2, 1000, nullptr);
InitRxWindows();
@@ -536,6 +538,9 @@
userManager.logout();
m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
}
+
+ CAxisSettingsDlg loginDlg;
+ loginDlg.DoModal();
}
}
@@ -578,10 +583,7 @@
}
}
}
- else if (2 == nIDEvent) {
- KillTimer(2);
- theApp.m_model.createRemoteEqs();
- }
+
CDialogEx::OnTimer(nIDEvent);
}
--
Gitblit v1.9.3