~chenluhua/Bond2.git

			@@ -6,6 +6,7 @@
			#include "BlButton.h"
			#include "PageLog.h"
			#include "PageAlarm.h"
			#include "PageTransferLog.h"
			#include "PageRecipe.h"
			#include "TerminalDisplayDlg.h"
			#include "CPanelMaster.h"
			@@ -15,6 +16,7 @@
			#include "CPageGraph2.h"
			#include "TopToolbar.h"
			#include "CMyStatusbar.h"
			#include "CRobotTaskDlg.h"


			// CServoDlg 对话框
			@@ -32,17 +34,19 @@
			void InitRxWindows();
			void Resize();
			void ShowChildPage(int index);
			void UpdateLoginStatus();
			CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);

			private:
			IObserver* m_pObserver;
			CTerminalDisplayDlg* m_pTerminalDisplayDlg;
			CRobotTaskDlg* m_pRobotTaskDlg;
			CPageGraph1* m_pPageGraph1;
			CPageGraph2* m_pPageGraph2;
			CPageRecipe* m_pPageRecipe;
			CPageAlarm* m_pPageAlarm;
			CPageLog* m_pPageLog;

			CPageTransferLog* m_pPageTransferLog;

			// 对话框数据
			#ifdef AFX_DESIGN_TIME
			@@ -86,6 +90,8 @@
			afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
			afx_msg void OnMenuFileExit();
			afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
			afx_msg void OnMenuProjectVarialbleList();
			afx_msg void OnUpdateMenuProjectVarialbleList(CCmdUI* pCmdUI);
			afx_msg void OnMenuTestMessageSet();
			afx_msg void OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI);
			afx_msg void OnMenuTestMessageClear();
			@@ -95,4 +101,5 @@
			afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
			afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
			LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam);
			LRESULT OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam);
			};