From f11be08369d2d360dd265382c6afbb3bc2edc107 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 10:58:57 +0800
Subject: [PATCH] 1.合并
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index d8e18a2..688f61b 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,7 +4,6 @@
#include "BLLabel.h"
#include "CPLC.h"
-
// CAxisSettingsDlg 瀵硅瘽妗�
enum class AxisOperationType {
@@ -12,6 +11,7 @@
JOG_ADD, // 姝ｅ悜鐐瑰姩
JOG_SUB, // 鍙嶅悜鐐瑰姩
STOP, // 鍋滄鎿嶄綔
+ SEV_ON, // 浣胯兘
POSITION_1, // 瀹氫綅鐐�1
POSITION_2, // 瀹氫綅鐐�2
POSITION_3, // 瀹氫綅鐐�3
@@ -43,7 +43,7 @@
void AdjustControls(float dScaleX, float dScaleY);
void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
void AdjustLabelFont(CBLLabel& label);
- void SetLabelColor(CBLLabel& label, COLORREF clr);
+ void SetLabelColor(CBLLabel& label, COLORREF color);
void updatePageButtonStates();
int getCurrentSelectedAxisID();
void initializeAxisIDCombo();
@@ -69,18 +69,34 @@
CString m_strRecipeName;
// 鎸変笅鏍囪瘑
- ULONGLONG m_ullJogPressedTick;
- BOOL m_bJogSubState;
- BOOL m_bJogAddState;
+ BOOL m_bJogAddPressed;
+ BOOL m_bJogSubPressed;
// 鎺т欢
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;
+
+ // 璇诲埌鐨勬暟鎹�
+ 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 鏀寔
@@ -105,6 +121,10 @@
afx_msg void OnBnClickedButtonAxisTestStop();
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()
+public:
+ afx_msg void OnBnClickedButtonAxisSev();
};
--
Gitblit v1.9.3