From 334b16b4abb4cbe3d1d4e4f211efd6f4468ae09f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 19 九月 2025 15:12:52 +0800
Subject: [PATCH] 1.ControlJob和ProcessJob的中断操作，强制结批增加字符串描述原因，方便生产跟踪。
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 012a8ac..ef66b8f 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -2,10 +2,37 @@
#include "afxdialogex.h"
#include "BlButton.h"
#include "BLLabel.h"
+#include "RegexEdit.h"
#include "CPLC.h"
+#include "CBaseDlg.h"
+// 姣忛〉瀹氫綅鐐规樉绀轰釜鏁�
+#define AXIS_PAGE_SIZE 5
-#define BTN_MAX 10
+// Label鎺т欢
+#define LABEL_MAX 6
+#define LABEL_FLS 0
+#define LABEL_DOG 1
+#define LABEL_RLS 2
+#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
#define BTN_PAGE1 0
#define BTN_PAGE2 1
#define BTN_PAGE3 2
@@ -14,9 +41,13 @@
#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
-
+#define BTN_JOG_OPR 8
+#define BTN_JOG_STOP 9
+#define BTN_POINT1 10
+#define BTN_POINT2 11
+#define BTN_POINT3 12
+#define BTN_POINT4 13
+#define BTN_POINT5 14
// CAxisSettingsDlg 瀵硅瘽妗�
@@ -33,7 +64,7 @@
POSITION_5 // 瀹氫綅鐐�5
};
-class CAxisSettingsDlg : public CDialogEx
+class CAxisSettingsDlg : public CBaseDlg
{
DECLARE_DYNAMIC(CAxisSettingsDlg)
@@ -52,12 +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();
@@ -75,8 +105,6 @@
private:
CPLC* m_pPLC;
- int m_nInitialWidth;
- int m_nInitialHeight;
// 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮�
int m_currentPage;
@@ -86,13 +114,10 @@
// 鎺т欢
CBlButton* m_pBlBtns[BTN_MAX];
- CBLLabel* m_pBlLabels[6];
+ 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;
@@ -109,14 +134,14 @@
BOOL m_bReady;
BOOL m_bBusy;
BOOL m_bErr;
+ DWORD m_nBtnsFlashState6;
+ DWORD m_nBtnsFlashState8;
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);
afx_msg void OnBnClickedButtonAxisLast();
afx_msg void OnBnClickedButtonAxisNext();
afx_msg void OnBnClickedButtonAxisAnchorPointGroup1();
@@ -134,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