From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 5093409..ef66b8f 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -2,12 +2,14 @@
#include "afxdialogex.h"
#include "BlButton.h"
#include "BLLabel.h"
+#include "RegexEdit.h"
#include "CPLC.h"
+#include "CBaseDlg.h"
// 姣忛〉瀹氫綅鐐规樉绀轰釜鏁�
#define AXIS_PAGE_SIZE 5
-// LABEL鎺т欢
+// Label鎺т欢
#define LABEL_MAX 6
#define LABEL_FLS 0
#define LABEL_DOG 1
@@ -15,6 +17,19 @@
#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
@@ -49,7 +64,7 @@
POSITION_5 // 瀹氫綅鐐�5
};
-class CAxisSettingsDlg : public CDialogEx
+class CAxisSettingsDlg : public CBaseDlg
{
DECLARE_DYNAMIC(CAxisSettingsDlg)
@@ -68,14 +83,11 @@
private:
UINT FindIDByName(const CString& strControlID);
- CFont* GetOrCreateFont(int nFontSize);
- void SetDefaultFont();
- void AdjustControls(float dScaleX, float dScaleY);
- 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();
@@ -93,8 +105,6 @@
private:
CPLC* m_pPLC;
- int m_nInitialWidth;
- int m_nInitialHeight;
// 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮�
int m_currentPage;
@@ -105,12 +115,9 @@
// 鎺т欢
CBlButton* m_pBlBtns[BTN_MAX];
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;
-
- std::map<int, CRect> m_mapCtrlLayouts;
- std::map<int, CFont*> m_mapFonts;
// 璇诲埌鐨勬暟鎹�
BOOL m_bSEV;
@@ -135,8 +142,6 @@
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);
afx_msg void OnBnClickedButtonAxisLast();
afx_msg void OnBnClickedButtonAxisNext();
afx_msg void OnBnClickedButtonAxisAnchorPointGroup1();
@@ -154,6 +159,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();
--
Gitblit v1.9.3