From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/Servo/ServoDlg.cpp |  394 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 208 insertions(+), 186 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 28bbd95..17306f8 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -9,11 +9,12 @@
 #include "Common.h"
 #include "Log.h"
 #include "SecsTestDlg.h"
-#include "AlarmDlg.h"
 #include <chrono>
 #include <thread>
 #include <cmath>
 #include "HmTab.h"
+#include "CRobotCmdContainerDlg.h"
+#include "CRobotCmdTestDlg.h"
 
 
 #ifdef _DEBUG
@@ -23,6 +24,10 @@
 
 /* 创建终端的定时器 */
 #define TIMER_ID_CREATE_TERMINAL		1
+
+/* 运行时间定时器 */
+#define TIMER_ID_UPDATE_RUMTIME			2
+
 
 
 // 用于应用程序“关于”菜单项的 CAboutDlg 对话框
@@ -61,17 +66,12 @@
 // CServoDlg 对话框
 
 
-
 CServoDlg::CServoDlg(CWnd* pParent /*=NULL*/)
 	: CDialogEx(IDD_SERVO_DIALOG, pParent)
 {
 	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
 	m_crBkgnd = APPDLG_BACKGROUND_COLOR;
 	m_hbrBkgnd = nullptr;
-	m_bShowLogWnd = FALSE;
-	m_bShowAlarmWnd = FALSE;
-	m_pLogDlg = nullptr;
-	m_pAlarmDlg = nullptr;
 	m_pTerminalDisplayDlg = nullptr;
 	m_pObserver = nullptr;
 	m_pPanelMaster = nullptr;
@@ -79,13 +79,17 @@
 	m_pPanelAttributes = nullptr;
 	m_pPageGraph1 = nullptr;
 	m_pPageGraph2 = nullptr;
+	m_pPageAlarm = nullptr;
+	m_pPageLog = nullptr;
+	m_pPageRecipe = nullptr;
+	m_pTopToolbar = nullptr;
+	m_pMyStatusbar = nullptr;
+	m_pRobotTaskDlg = nullptr;
 }
 
 void CServoDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialogEx::DoDataExchange(pDX);
-	DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
-	DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
 }
 
 BEGIN_MESSAGE_MAP(CServoDlg, CDialogEx)
@@ -96,11 +100,8 @@
 	ON_BN_CLICKED(IDCANCEL, &CServoDlg::OnBnClickedCancel)
 	ON_WM_CTLCOLOR()
 	ON_WM_DESTROY()
-	ON_BN_CLICKED(IDC_BUTTON_LOG, &CServoDlg::OnBnClickedButtonLog)
 	ON_WM_SIZE()
 	ON_WM_CLOSE()
-	ON_MESSAGE(ID_MSG_LOGDLG_HIDE, &CServoDlg::OnLogDlgHide)
-	ON_MESSAGE(ID_MSG_ALARMDLG_HIDE, &CServoDlg::OnAlarmDlgHide)
 	ON_WM_MOVING()
 	ON_WM_MOVE()
 	ON_COMMAND(ID_MENU_FILE_EXIT, &CServoDlg::OnMenuFileExit)
@@ -109,10 +110,6 @@
 	ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SETTINGS, &CServoDlg::OnUpdateMenuFileSettings)
 	ON_COMMAND(ID_MENU_FILE_SECSTEST, &CServoDlg::OnMenuFileSecsTest)
 	ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SECSTEST, &CServoDlg::OnUpdateMenuFileSecsTest)
-	ON_COMMAND(ID_MENU_WND_LOG, &CServoDlg::OnMenuWndLog)
-	ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
-	ON_COMMAND(ID_MENU_WND_ALARM, &CServoDlg::OnMenuWndAlarm)
-	ON_UPDATE_COMMAND_UI(ID_MENU_WND_ALARM, &CServoDlg::OnUpdateMenuWndAlarm)
 	ON_COMMAND(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnMenuTestMessageSet)
 	ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
 	ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
@@ -120,10 +117,10 @@
 	ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
 	ON_WM_INITMENUPOPUP()
 	ON_WM_TIMER()
-	ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
-	ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
 	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)
+	ON_MESSAGE(ID_MSG_STATUSBAR_BTN_CLICKED, &CServoDlg::OnStatusbarBtnClicked)
 END_MESSAGE_MAP()
 
 
@@ -171,6 +168,41 @@
 					if (!m_pPanelAttributes->IsWindowVisible()) {
 						m_pPanelAttributes->ShowWindow(SW_SHOW);
 						Resize();
+					}
+				}
+			}
+			else if (RX_CODE_MASTER_STATE_CHANGED == code) {
+				SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
+				if (state == SERVO::MASTERSTATE::READY) {
+					m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_NORMAL);
+					m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
+					KillTimer(TIMER_ID_UPDATE_RUMTIME);
+					CString strText;
+					GetRuntimeFormatText(strText, "");
+					m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
+				}
+				else if (state == SERVO::MASTERSTATE::RUNNING) {
+					m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_RUNNING);
+					m_pMyStatusbar->setForegroundColor(RGB(255, 255, 255));
+					SetTimer(TIMER_ID_UPDATE_RUMTIME, 500, nullptr);
+				}
+			}
+			else if (RX_CODE_EQ_ROBOT_TASK == code) {
+				SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
+				if (m_pRobotTaskDlg != nullptr) {
+					m_pRobotTaskDlg->SetRobotTask(pTask);
+				}
+				if (pTask == nullptr) {
+					m_pMyStatusbar->setCurTaskBtnText("无");
+				}
+				else {
+					SERVO::CEquipment* pEq1, * pEq2;
+					pEq1 = theApp.m_model.getMaster().getEquipment(pTask->getSrcPosition());
+					pEq2 = theApp.m_model.getMaster().getEquipment(pTask->getTarPosition());
+					if (pEq1 != nullptr && pEq2 != nullptr) {
+						CString strText;
+						strText.Format(_T("%s --> %s"), pEq1->getName().c_str(), pEq2->getName().c_str());
+						m_pMyStatusbar->setCurTaskBtnText((LPTSTR)(LPCTSTR)strText);
 					}
 				}
 			}
@@ -224,18 +256,37 @@
 	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();
 	m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
 	m_pPageGraph2 = new CPageGraph2();
 	m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
+	m_pPageRecipe = new CPageRecipe();
+	m_pPageRecipe->Create(IDD_PAGE_RECIPE, this);
+	m_pPageAlarm = new CPageAlarm();
+	m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
+	m_pPageLog = new CPageLog();
+	m_pPageLog->Create(IDD_DIALOG_LOG, this);
 
 	CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
 	m_pTab->SetPaddingLeft(20);
 	m_pTab->SetItemMarginLeft(18);
 	m_pTab->AddItem("状态图", FALSE);
 	m_pTab->AddItem("连接图", TRUE);
+	m_pTab->AddItem("配方", TRUE);
+	m_pTab->AddItem("报警", TRUE);
+	m_pTab->AddItem("日志", TRUE);
 	m_pTab->SetCurSel(0);
 	m_pTab->SetBkgndColor(RGB(222, 222, 222));
 	ShowChildPage(0);
@@ -249,6 +300,12 @@
 	m_pPanelAttributes = new CPanelAttributes();
 	m_pPanelAttributes->Create(IDD_PANEL_ATTRIBUTES, this);
 	
+
+	// statusbar
+	m_pMyStatusbar = new CMyStatusbar();
+	m_pMyStatusbar->Create(IDD_STATUSBAR, this);
+	m_pMyStatusbar->ShowWindow(SW_SHOW);
+
 
 
 	// 调整初始窗口位置
@@ -265,14 +322,15 @@
 
 	SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
 	InitRxWindows();
-	OnBnClickedButtonLog();
-	UpdateLogBtn();
-	UpdateAlarmBtn();
 	Resize();
 
 
 	// 相当于延时调用master的初始化
 	theApp.m_model.m_master.init();
+
+
+	// 初始化master以后需要控件绑定数据
+	m_pPageGraph1->BindEquipmentToGraph();
 
 
 	return TRUE;  // 除非将焦点设置到控件，否则返回 TRUE
@@ -419,26 +477,6 @@
 	pCmdUI->Enable(TRUE);
 }
 
-void CServoDlg::OnMenuWndLog()
-{
-	OnBnClickedButtonLog();
-}
-
-void CServoDlg::OnUpdateMenuWndLog(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_bShowLogWnd);
-}
-
-void CServoDlg::OnMenuWndAlarm()
-{
-	OnBnClickedButtonAlarm();
-}
-
-void CServoDlg::OnUpdateMenuWndAlarm(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_bShowAlarmWnd);
-}
-
 void CServoDlg::OnMenuFileExit()
 {
 	PostMessage(WM_CLOSE);
@@ -516,16 +554,23 @@
 {
 	CDialogEx::OnDestroy();
 
-	if (m_pLogDlg != nullptr) {
-		m_pLogDlg->DestroyWindow();
-		delete m_pLogDlg;
-		m_pLogDlg = nullptr;
+
+	if (m_pTopToolbar != nullptr) {
+		m_pTopToolbar->DestroyWindow();
+		delete m_pTopToolbar;
+		m_pTopToolbar = nullptr;
 	}
 
-	if (m_pAlarmDlg != nullptr) {
-		m_pAlarmDlg->DestroyWindow();
-		delete m_pAlarmDlg;
-		m_pAlarmDlg = nullptr;
+	if (m_pMyStatusbar != nullptr) {
+		m_pMyStatusbar->DestroyWindow();
+		delete m_pMyStatusbar;
+		m_pMyStatusbar = nullptr;
+	}
+
+	if (m_pRobotTaskDlg != nullptr) {
+		m_pRobotTaskDlg->DestroyWindow();
+		delete m_pRobotTaskDlg;
+		m_pRobotTaskDlg = nullptr;
 	}
 
 	if (m_pTerminalDisplayDlg != nullptr) {
@@ -564,6 +609,24 @@
 		m_pPageGraph2 = nullptr;
 	}
 
+	if (m_pPageRecipe != nullptr) {
+		m_pPageRecipe->DestroyWindow();
+		delete m_pPageRecipe;
+		m_pPageRecipe = nullptr;
+	}
+
+	if (m_pPageAlarm != nullptr) {
+		m_pPageAlarm->DestroyWindow();
+		delete m_pPageAlarm;
+		m_pPageAlarm = nullptr;
+	}
+
+	if (m_pPageLog != nullptr) {
+		m_pPageLog->DestroyWindow();
+		delete m_pPageLog;
+		m_pPageLog = nullptr;
+	}
+
 	if (m_hbrBkgnd != nullptr) {
 		::DeleteObject(m_hbrBkgnd);
 	}
@@ -575,122 +638,54 @@
 
 }
 
-void CServoDlg::OnBnClickedButtonAlarm()
-{
-	m_bShowAlarmWnd = !m_bShowAlarmWnd;
-
-	// 如果要显示报警窗口，则隐藏日志窗口
-	if (m_bShowLogWnd) {
-		m_bShowLogWnd = false;
-		if (m_pLogDlg != nullptr) {
-			m_pLogDlg->ShowWindow(SW_HIDE);
-			UpdateLogBtn();
-		}
-	}
-
-	if (m_pAlarmDlg == nullptr) {
-		m_pAlarmDlg = new CAlarmDlg();
-		m_pAlarmDlg->Create(IDD_DIALOG_ALARM, this);
-
-		CRect rcWnd;
-		GetWindowRect(&rcWnd);
-		int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
-		if (nHeight < 280) nHeight = 280;
-		m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
-	}
-	ASSERT(m_pAlarmDlg);
-	m_pAlarmDlg->ShowWindow(m_bShowAlarmWnd ? SW_SHOW : SW_HIDE);
-
-	UpdateAlarmBtn();
-}
-
-void CServoDlg::OnBnClickedButtonLog()
-{
-	m_bShowLogWnd = !m_bShowLogWnd;
-
-	// 如果要显示日志窗口，则隐藏报警窗口
-	if (m_bShowLogWnd) {
-		m_bShowAlarmWnd = false;
-		if (m_pAlarmDlg != nullptr) {
-			m_pAlarmDlg->ShowWindow(SW_HIDE);
-			UpdateAlarmBtn();
-		}
-	}
-
-	if (m_pLogDlg == nullptr) {
-		m_pLogDlg = new CLogDlg();
-		m_pLogDlg->Create(IDD_DIALOG_LOG, this);
-
-		CRect rcWnd;
-		GetWindowRect(&rcWnd);
-		int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
-		if (nHeight < 280) nHeight = 280;
-		m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
-	}
-	ASSERT(m_pLogDlg);
-	m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);
-	
-	UpdateLogBtn();
-}
-
-void CServoDlg::UpdateLogBtn()
-{
-	m_btnLog.SetFrameColor(BS_NORMAL, BTN_LOG_FRAME_NORMAL);
-	m_btnLog.SetFrameColor(BS_HOVER, BTN_LOG_FRAME_HOVER);
-	m_btnLog.SetFrameColor(BS_PRESS, BTN_LOG_FRAME_PRESS);
-	m_btnLog.SetBkgndColor(BS_NORMAL, m_bShowLogWnd ? BTN_LOG_BKGND_PRESS : BTN_LOG_BKGND_NORMAL);
-	m_btnLog.SetBkgndColor(BS_HOVER, BTN_LOG_BKGND_HOVER);
-	m_btnLog.SetBkgndColor(BS_PRESS, BTN_LOG_BKGND_PRESS);
-	m_btnLog.Invalidate();
-}
-
-void CServoDlg::UpdateAlarmBtn()
-{
-	m_btnAlarm.SetFrameColor(BS_NORMAL, BTN_ALARM_FRAME_NORMAL);
-	m_btnAlarm.SetFrameColor(BS_HOVER, BTN_ALARM_FRAME_HOVER);
-	m_btnAlarm.SetFrameColor(BS_PRESS, BTN_ALARM_FRAME_PRESS);
-	m_btnAlarm.SetBkgndColor(BS_NORMAL, m_bShowAlarmWnd ? BTN_ALARM_BKGND_PRESS : BTN_ALARM_BKGND_NORMAL);
-	m_btnAlarm.SetBkgndColor(BS_HOVER, BTN_ALARM_BKGND_HOVER);
-	m_btnAlarm.SetBkgndColor(BS_PRESS, BTN_ALARM_BKGND_PRESS);
-	m_btnAlarm.Invalidate();
-}
-
 void CServoDlg::OnSize(UINT nType, int cx, int cy)
 {
 	CDialogEx::OnSize(nType, cx, cy);
 	if (GetDlgItem(IDC_TAB1) == nullptr) return;
 	if (m_pPageGraph1 == nullptr) return;
 	if (m_pPageGraph2 == nullptr) return;
+	if (m_pPageRecipe == nullptr) return;
+	if (m_pPageAlarm == nullptr) return;
+	if (m_pPageLog == nullptr) return;
 	
 	Resize();
 	Invalidate();
 }
 
+#define TOOLBAR_HEIGHT		78
+#define STATUSBAR_HEIGHT	38
 void CServoDlg::Resize()
 {
 	CRect rcClient, rcItem;
 	CWnd* pItem = nullptr;
-	int x, y;
+	int x, y, y2;
 	GetClientRect(&rcClient);
 
 	x = 0;
 	y = 0;
+	y2 = rcClient.bottom - STATUSBAR_HEIGHT;
+	m_pTopToolbar->MoveWindow(0, 0, rcClient.Width(), TOOLBAR_HEIGHT);
+	y += TOOLBAR_HEIGHT;
+
+
+	
+
 	int nPanelWidth = 0;
 	if (m_pPanelMaster != nullptr) {
 		nPanelWidth = m_pPanelMaster->getPanelWidth();
-		m_pPanelMaster->MoveWindow(x, y, nPanelWidth, rcClient.Height());
+		m_pPanelMaster->MoveWindow(x, y, nPanelWidth, y2 - y);
 		x += nPanelWidth;
 	}
 
 	if (m_pPanelEquipment != nullptr && m_pPanelEquipment->IsWindowVisible()) {
 		nPanelWidth = m_pPanelEquipment->getPanelWidth();
-		m_pPanelEquipment->MoveWindow(x, y, nPanelWidth, rcClient.Height());
+		m_pPanelEquipment->MoveWindow(x, y, nPanelWidth, y2 - y);
 		x += nPanelWidth;
 	}
 
 	if (m_pPanelAttributes != nullptr && m_pPanelAttributes->IsWindowVisible()) {
 		nPanelWidth = m_pPanelAttributes->getPanelWidth();
-		m_pPanelAttributes->MoveWindow(x, y, nPanelWidth, rcClient.Height());
+		m_pPanelAttributes->MoveWindow(x, y, nPanelWidth, y2 - y);
 		x += nPanelWidth;
 	}
 
@@ -701,21 +696,14 @@
 	y += rcItem.Height();
 
 
-	m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
-	m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
+	m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
+	m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
+	m_pPageRecipe->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
+	m_pPageAlarm->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
+	m_pPageLog->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
 
 
-	x = rcClient.right - 8;
-	pItem = GetDlgItem(IDC_BUTTON_LOG);
-	pItem->GetClientRect(&rcItem);
-	x -= rcItem.Width();
-	pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
-	x -= 8;
-
-	pItem = GetDlgItem(IDC_BUTTON_ALARM);
-	pItem->GetClientRect(&rcItem);
-	x -= rcItem.Width();
-	pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+	m_pMyStatusbar->MoveWindow(0, y2, rcClient.Width(), STATUSBAR_HEIGHT);
 }
 
 void CServoDlg::OnClose()
@@ -725,32 +713,6 @@
 	CDialogEx::OnClose();
 }
 
-LRESULT CServoDlg::OnLogDlgHide(WPARAM wParam, LPARAM lParam)
-{
-	m_bShowLogWnd = FALSE;
-	UpdateLogBtn();
-	LOGE("OnLogDlgHide");
-
-	unsigned int DATAID, RPTID;
-	DATAID = 111;
-	RPTID = 1001;
-	std::vector<std::string> v;
-	v.push_back("abc");
-	v.push_back("def");
-	theApp.m_model.m_hsmsPassive.requestEventReportSend(DATAID, RPTID, v);
-
-	return 0;
-}
-
-LRESULT CServoDlg::OnAlarmDlgHide(WPARAM wParam, LPARAM lParam)
-{
-	m_bShowAlarmWnd = FALSE;
-	UpdateAlarmBtn();
-	LOGE("OnAlarmDlgHide");
-
-	return 0;
-}
-
 void CServoDlg::OnMoving(UINT fwSide, LPRECT pRect)
 {
 	CDialogEx::OnMoving(fwSide, pRect);
@@ -758,17 +720,6 @@
 
 void CServoDlg::OnMove(int x, int y)
 {
-	if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
-		CRect rcWnd;
-		GetWindowRect(&rcWnd);
-		m_pLogDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
-	}
-
-	if (m_pAlarmDlg != nullptr && !m_pAlarmDlg->IsZoomed()) {
-		CRect rcWnd;
-		GetWindowRect(&rcWnd);
-		m_pAlarmDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
-	}
 
 	CDialogEx::OnMove(x, y);
 }
@@ -791,12 +742,23 @@
 		m_pTerminalDisplayDlg->Create(IDD_DIALOG_TERMINAL_DISPLAY, this);
 	}
 
+	if (TIMER_ID_UPDATE_RUMTIME == nIDEvent) {
+		static int index = 0; index++;
+		if (index >= 4) index = 0;
+		static char* status[] = {"|", "/", "--", "\\"};
+
+		CString strText;
+		GetRuntimeFormatText(strText, status[index]);
+		m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
+	}
+
+
 	CDialogEx::OnTimer(nIDEvent);
 }
 
 LRESULT CServoDlg::OnPanelResize(WPARAM wParam, LPARAM lParam)
 {
-	int width = wParam;
+	int width = (int)wParam;
 	// m_pPanel->SetPanelWidth(width);
 	Resize();
 
@@ -813,11 +775,71 @@
 
 void CServoDlg::ShowChildPage(int index)
 {
-	ASSERT(0 <= index && index < 3);
-	static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2 };
-	for (int i = 0; i < 2; i++) {
+	ASSERT(0 <= index && index < 5);
+	static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageRecipe, m_pPageAlarm, m_pPageLog };
+	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;
+}
 
+LRESULT CServoDlg::OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam)
+{
+	int id = (int)lParam;
+	int x = (int)wParam;
+	if (id == IDC_BUTTON_ROBOTTASK) {
+		if (m_pRobotTaskDlg == nullptr) {
+			m_pRobotTaskDlg = new CRobotTaskDlg();
+			m_pRobotTaskDlg->Create(IDD_DIALOG_ROBOT_TASK, this);
+		}
+
+		CRect rcBar;
+		int h = 258;
+		int w = 388;
+		m_pRobotTaskDlg->SetRobotTask(theApp.m_model.getMaster().getActiveRobotTask());
+		m_pMyStatusbar->GetWindowRect(rcBar);
+		m_pRobotTaskDlg->MoveWindow(x, rcBar.top - h, w, h);
+		m_pRobotTaskDlg->ShowWindow(SW_SHOW);
+	}
+	return 0;
+}
+
+CString& CServoDlg::GetRuntimeFormatText(CString& strText, const char* pszSuffix)
+{
+	ULONGLONG ullRunTime = (ULONGLONG)(theApp.m_model.getMaster().getRunTime() * 0.001);
+	int h, m, s;
+	h = int(ullRunTime / 3600);
+	m = int((ullRunTime % 3600) / 60);
+	s = int(ullRunTime % 60);
+
+	SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
+	if (state == SERVO::MASTERSTATE::RUNNING) {
+		strText.Format(_T("正在运行：%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
+	}
+	else {
+		strText.Format(_T("已运行：%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
+	}
+
+	return strText;
+}
\ No newline at end of file

--
Gitblit v1.9.3