~chenluhua/Bond2.git

			@@ -2,10 +2,36 @@
			#include "afxdialogex.h"
			#include "BlButton.h"
			#include "BLLabel.h"
			#include "RegexEdit.h"
			#include "CPLC.h"

			// 每页定位点显示个数
			#define AXIS_PAGE_SIZE 5

			#define BTN_MAX 10
			// Label控件
			#define LABEL_MAX 6
			#define LABEL_FLS 0
			#define LABEL_DOG 1
			#define LABEL_RLS 2
			#define LABEL_READY 3
			#define LABEL_BUSY 4
			#define LABEL_ERR 5

			// RegexEdit控件
			#define EDIT_MAX 10
			#define EDIT_MANUAL_SPEED 0
			#define EDIT_AUTO_SPEED 1
			#define EDIT_ACCE_TIME 2
			#define EDIT_DECE_TIME 3
			#define EDIT_MICROMENTUM 4
			#define EDIT_ANCHOR_POINT1 5
			#define EDIT_ANCHOR_POINT2 6
			#define EDIT_ANCHOR_POINT3 7
			#define EDIT_ANCHOR_POINT4 8
			#define EDIT_ANCHOR_POINT5 9

			// BUTTON控件
			#define BTN_MAX 15
			#define BTN_PAGE1 0
			#define BTN_PAGE2 1
			#define BTN_PAGE3 2
			@@ -14,9 +40,13 @@
			#define BTN_JOG_ADD 5
			#define BTN_JOG_SUB 6
			#define BTN_JOG_SEV 7
			#define BTN_JOG_STOP 8
			#define BTN_JOG_OPR 9

			#define BTN_JOG_OPR 8
			#define BTN_JOG_STOP 9
			#define BTN_POINT1 10
			#define BTN_POINT2 11
			#define BTN_POINT3 12
			#define BTN_POINT4 13
			#define BTN_POINT5 14

			// CAxisSettingsDlg 对话框

			@@ -58,6 +88,9 @@
			void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
			void AdjustLabelFont(CBLLabel& label);
			void SetLabelColor(CBLLabel& label, COLORREF color);
			void SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse);
			void UpdateLabels();
			void UpdateRegexEdit(CRegexEdit* pRegexEdit, const ValueRange& range, const CString& title);
			void updatePageButtonStates();
			void HideEditCursor(int nCtrlID);
			int getCurrentSelectedAxisID();
			@@ -86,10 +119,11 @@

			// 控件
			CBlButton* m_pBlBtns[BTN_MAX];
			CBLLabel* m_pBlLabels[6];
			CBLLabel* m_pBlLabels[LABEL_MAX];
			CRegexEdit* m_pRegexEdit[EDIT_MAX];
			CComboBox m_comboAxisNO;
			CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
			CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance;
			//CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance;

			std::map<int, CRect> m_mapCtrlLayouts;
			std::map<int, CFont*> m_mapFonts;
			@@ -109,6 +143,8 @@
			BOOL m_bReady;
			BOOL m_bBusy;
			BOOL m_bErr;
			DWORD m_nBtnsFlashState6;
			DWORD m_nBtnsFlashState8;

			protected:
			virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
			@@ -134,6 +170,8 @@
			afx_msg void OnBnClickedButtonAxisSev();
			afx_msg void OnSelchangeComboAxisName();
			afx_msg void OnBnClickedButtonAxisSave();
			afx_msg void OnBnClickedButtonAxisUpdateUi();
			afx_msg void OnBnClickedButtonAxisDetailSettings();
			afx_msg LRESULT OnUpdateDataToUI(WPARAM wParam, LPARAM lParam);
			afx_msg void OnTimer(UINT_PTR nIDEvent);
			afx_msg void OnClose();