From 6d106eb1bb92dc235bcbda976ae232729bf52c7c Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 25 十一月 2024 13:46:15 +0800
Subject: [PATCH] 合并代码
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 6c73683..d8bb7f4 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -1,6 +1,7 @@
锘�#pragma once
#include "afxdialogex.h"
-
+#include "BLLabel.h"
+#include "CPLC.h"
// CAxisSettingsDlg 瀵硅瘽妗�
@@ -12,6 +13,9 @@
CAxisSettingsDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CAxisSettingsDlg();
+public:
+ void SetPLC(CPLC* pPLC);
+
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_DIALOG_AXIS_SETTINGS };
@@ -22,10 +26,21 @@
void SetDefaultFont();
void AdjustControls(float dScaleX, float dScaleY);
void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
+ void AdjustLabelFont(CBLLabel& label);
+ void SetStatusColor(CBLLabel& label, BOOL bStatus);
private:
+ CPLC* m_pPLC;
int m_nInitialWidth;
int m_nInitialHeight;
+
+ // 鎺т欢
+ CBLLabel m_staticFLS;
+ CBLLabel m_staticDOG;
+ CBLLabel m_staticRLS;
+ CBLLabel m_staticReady;
+ CBLLabel m_staticBusy;
+ CBLLabel m_staticErr;
std::map<int, CRect> m_mapCtrlLayouts;
std::map<int, CFont*> m_mapFonts;
@@ -51,5 +66,6 @@
afx_msg void OnBnClickedButtonAxisTestJogAdd();
afx_msg void OnBnClickedButtonAxisTestJogSub();
afx_msg void OnBnClickedButtonAxisTestStop();
+ afx_msg void OnTimer(UINT_PTR nIDEvent);
DECLARE_MESSAGE_MAP()
};
--
Gitblit v1.9.3