~chenluhua/Bond2.git

			@@ -4,6 +4,7 @@
			#include "BLLabel.h"
			#include "CPLC.h"


			// CAxisSettingsDlg 对话框

			enum class AxisOperationType {
			@@ -42,7 +43,7 @@
			void AdjustControls(float dScaleX, float dScaleY);
			void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
			void AdjustLabelFont(CBLLabel& label);
			void SetStatusColor(CBLLabel& label, BOOL bStatus);
			void SetLabelColor(CBLLabel& label, COLORREF clr);
			void updatePageButtonStates();
			int getCurrentSelectedAxisID();
			void initializeAxisIDCombo();
			@@ -51,9 +52,10 @@
			void updateAxisSelection(int offset);
			void updateDataFromUI(int nAxisId);
			void switchToPage(int targetPage);
			bool ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr);
			void writeAxisDataToPLC(int nAxisId);
			void handleAxisOperation(AxisOperationType eOpType, bool bPressed);

			void readPLCDataToUI(int nAxisId);

			private:
			CPLC* m_pPLC;
			@@ -67,22 +69,23 @@
			CString m_strRecipeName;

			// 按下标识
			BOOL m_bJogAddPressed;
			BOOL m_bJogSubPressed;
			ULONGLONG m_ullJogPressedTick;
			BOOL m_bJogSubState;
			BOOL m_bJogAddState;

			// 控件
			CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr;
			CBlButton m_pageButtons[5];
			CComboBox m_comboAxisNO;
			CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
			CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance;
			CBlButton m_pageButtons[5];

			std::map<int, CRect> m_mapCtrlLayouts;
			std::map<int, CFont*> m_mapFonts;

			protected:
			virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
			virtual BOOL OnInitDialog();
			virtual BOOL PreTranslateMessage(MSG* pMsg);
			afx_msg void OnSize(UINT nType, int cx, int cy);
			afx_msg void OnSizing(UINT fwSide, LPRECT pRect);
			afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
			@@ -100,14 +103,8 @@
			afx_msg void OnBnClickedButtonAxisAnchorPoint5();
			afx_msg void OnBnClickedButtonAxisTestOpr();
			afx_msg void OnBnClickedButtonAxisTestStop();
			afx_msg void OnBnClickedJogAddDown();
			afx_msg void OnBnClickedJogAddUp();
			afx_msg void OnBnClickedJogSubDown();
			afx_msg void OnBnClickedJogSubUp();
			afx_msg void OnSelchangeComboAxisName();
			afx_msg void OnBnClickedButtonAxisSave();
			afx_msg void OnTimer(UINT_PTR nIDEvent);
			//afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
			//afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
			DECLARE_MESSAGE_MAP()
			};