From 2d8047ec3451b7b411812970ee7b149bf1a9b2d6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 09:21:46 +0800
Subject: [PATCH] 1.轴参数设定，调试，合并；
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 971ee59..d8e18a2 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -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()
};
--
Gitblit v1.9.3