From f89766c67e39852650fe55cdfee371a204b2b01d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 18:04:45 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index d94c18b..012a8ac 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,6 +4,20 @@
#include "BLLabel.h"
#include "CPLC.h"
+
+#define BTN_MAX 10
+#define BTN_PAGE1 0
+#define BTN_PAGE2 1
+#define BTN_PAGE3 2
+#define BTN_PAGE4 3
+#define BTN_PAGE5 4
+#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
+
+
// CAxisSettingsDlg 瀵硅瘽妗�
enum class AxisOperationType {
@@ -11,6 +25,7 @@
JOG_ADD, // 姝ｅ悜鐐瑰姩
JOG_SUB, // 鍙嶅悜鐐瑰姩
STOP, // 鍋滄鎿嶄綔
+ SEV_ON, // 浣胯兘
POSITION_1, // 瀹氫綅鐐�1
POSITION_2, // 瀹氫綅鐐�2
POSITION_3, // 瀹氫綅鐐�3
@@ -42,12 +57,14 @@
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 color);
void updatePageButtonStates();
+ void HideEditCursor(int nCtrlID);
int getCurrentSelectedAxisID();
void initializeAxisIDCombo();
void refreshAxisDetails(int nAxisId);
void refreshPositionDetails(int nAxisId, int pageNumber);
+ void UpdatePositionRange(PositionRange& position, int pageNumber, int pageSize, int currentIndex);
void updateAxisSelection(int offset);
void updateDataFromUI(int nAxisId);
void switchToPage(int targetPage);
@@ -67,19 +84,31 @@
// 閰嶆柟鍚嶇О
CString m_strRecipeName;
- // 鎸変笅鏍囪瘑
- BOOL m_bJogAddPressed;
- BOOL m_bJogSubPressed;
-
// 鎺т欢
- CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr;
+ CBlButton* m_pBlBtns[BTN_MAX];
+ CBLLabel* m_pBlLabels[6];
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;
+
+ // 璇诲埌鐨勬暟鎹�
+ BOOL m_bSEV;
+ double m_fCurPos;
+ double m_fManualSpeed;
+ double m_fAutoSpeed;
+ double m_fPrm;
+ int m_nLoad;
+ int m_nErrCode;
+ int m_nAlarmCode;
+ BOOL m_bFLS;
+ BOOL m_bDOG;
+ BOOL m_bRLS;
+ BOOL m_bReady;
+ BOOL m_bBusy;
+ BOOL m_bErr;
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
@@ -102,8 +131,11 @@
afx_msg void OnBnClickedButtonAxisAnchorPoint5();
afx_msg void OnBnClickedButtonAxisTestOpr();
afx_msg void OnBnClickedButtonAxisTestStop();
+ afx_msg void OnBnClickedButtonAxisSev();
afx_msg void OnSelchangeComboAxisName();
afx_msg void OnBnClickedButtonAxisSave();
+ afx_msg LRESULT OnUpdateDataToUI(WPARAM wParam, LPARAM lParam);
afx_msg void OnTimer(UINT_PTR nIDEvent);
+ afx_msg void OnClose();
DECLARE_MESSAGE_MAP()
};
--
Gitblit v1.9.3