~chenluhua/Bond2.git

			@@ -13,6 +13,8 @@
			#include <thread>
			#include <cmath>
			#include "HmTab.h"
			#include "CRobotCmdContainerDlg.h"
			#include "CRobotCmdTestDlg.h"


			#ifdef _DEBUG
			@@ -76,6 +78,7 @@
			m_pPageAlarm = nullptr;
			m_pPageLog = nullptr;
			m_pPageRecipe = nullptr;
			m_pTopToolbar = nullptr;
			}

			void CServoDlg::DoDataExchange(CDataExchange* pDX)
			@@ -110,6 +113,7 @@
			ON_WM_TIMER()
			ON_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
			ON_NOTIFY(BYHMTAB_SEL_CHANGED, IDC_TAB1, &CServoDlg::OnTabSelChanged)
			ON_MESSAGE(ID_MSG_TOOLBAR_BTN_CLICKED, &CServoDlg::OnToolbarBtnClicked)
			END_MESSAGE_MAP()


			@@ -209,6 +213,17 @@
			menu.LoadMenu(IDR_MENU_APP);
			SetMenu(&menu);


			// toolbar
			m_pTopToolbar = new CTopToolbar();
			m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
			m_pTopToolbar->ShowWindow(SW_SHOW);
			m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
			m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(FALSE);
			HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
			ASSERT(hMenu);
			::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND \| MF_DISABLED \| MF_GRAYED);


			// Tab
			m_pPageGraph1 = new CPageGraph1();
			@@ -491,6 +506,12 @@
			CDialogEx::OnDestroy();


			if (m_pTopToolbar != nullptr) {
			m_pTopToolbar->DestroyWindow();
			delete m_pTopToolbar;
			m_pTopToolbar = nullptr;
			}

			if (m_pTerminalDisplayDlg != nullptr) {
			m_pTerminalDisplayDlg->DestroyWindow();
			delete m_pTerminalDisplayDlg;
			@@ -570,6 +591,7 @@
			Invalidate();
			}

			#define TOOLBAR_HEIGHT 78
			void CServoDlg::Resize()
			{
			CRect rcClient, rcItem;
			@@ -579,6 +601,9 @@

			x = 0;
			y = 0;
			m_pTopToolbar->MoveWindow(0, 0, rcClient.Width(), TOOLBAR_HEIGHT);
			y += TOOLBAR_HEIGHT;

			int nPanelWidth = 0;
			if (m_pPanelMaster != nullptr) {
			nPanelWidth = m_pPanelMaster->getPanelWidth();
			@@ -675,4 +700,27 @@
			for (int i = 0; i < 5; i++) {
			pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
			}
			}

			LRESULT CServoDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
			{
			int id = (int)lParam;
			if (id == IDC_BUTTON_RUN) {
			theApp.m_model.getMaster().start();
			m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
			m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);

			}
			else if (id == IDC_BUTTON_STOP) {
			theApp.m_model.getMaster().stop();
			m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
			m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
			}
			else if (id == IDC_BUTTON_ROBOT) {
			SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)theApp.m_model.getMaster().getEquipment(EQ_ID_EFEM);
			CRobotCmdTestDlg dlg;
			dlg.SetEFEM(pEFEM);
			dlg.DoModal();
			}
			return 0;
			}