~chenluhua/Bond2.git

			@@ -7,10 +7,13 @@
			#include "BondEqDlg.h"
			#include "afxdialogex.h"
			#include "Common.h"
			#include "Servo.h"
			#include "CBonder.h"
			#include "SettingsDlg.h"
			#include "UserManager.h"
			#include "LoginDlg.h"

			// test
			#include "AxisSettingsDlg.h"


			#ifdef _DEBUG
			@@ -195,6 +198,9 @@
			m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
			m_pTopToolbar->ShowWindow(SW_SHOW);
			m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
			HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
			ASSERT(hMenu);
			::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND \| MF_DISABLED \| MF_GRAYED);


			// 设备面板
			@@ -212,7 +218,6 @@
			// Homeҳ
			m_pHomeDialog = CreateHomeDlg();
			ShowWindow(SW_SHOWMAXIMIZED);
			SetTimer(2, 1000, nullptr);


			InitRxWindows();
			@@ -279,8 +284,8 @@
			void CBondEqDlg::OnClose()
			{
			// TODO: 在此添加消息处理程序代码和/或调用默认值
			CServo& servo = theApp.m_model.getServo();
			if (servo.isRunning()) {
			CBonder& bonder = theApp.m_model.getBonder();
			if (bonder.isRunning()) {
			AfxMessageBox("程序和机器正在运行中，请先停止工作再退出程序！");
			return;
			}
			@@ -453,7 +458,7 @@

			void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
			{
			pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
			pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
			}

			void CBondEqDlg::OnMenuFileExit()
			@@ -463,7 +468,7 @@

			void CBondEqDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
			{
			pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
			pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
			}

			void CBondEqDlg::OnMenuHelpAbout()
			@@ -536,6 +541,9 @@
			userManager.logout();
			m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
			}

			CAxisSettingsDlg loginDlg;
			loginDlg.DoModal();
			}
			}

			@@ -578,10 +586,7 @@
			}
			}
			}
			else if (2 == nIDEvent) {
			KillTimer(2);
			theApp.m_model.createRemoteEqs();
			}


			CDialogEx::OnTimer(nIDEvent);
			}