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 +++
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 343 +++++++++++++++++++++++++-----------------------
2 files changed, 207 insertions(+), 168 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 7ac933d..58b0515 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -22,8 +22,21 @@
m_nInitialWidth = 0;
m_nInitialHeight = 0;
m_pPLC = nullptr;
- m_bJogAddState = FALSE;
- m_bJogSubState = FALSE;
+
+ m_bSEV = FALSE;
+ m_fCurPos = 0.0;
+ m_fManualSpeed = 0.0;
+ m_fAutoSpeed = 0.0;
+ m_fPrm = 0.0;
+ m_nLoad = 0;
+ m_nErrCode = 0;
+ m_nAlarmCode = 0;
+ m_bFLS = FALSE;
+ m_bDOG = FALSE;
+ m_bRLS = FALSE;
+ m_bReady = FALSE;
+ m_bBusy = FALSE;
+ m_bErr = FALSE;
}
CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -191,11 +204,11 @@
label.UpdateWindow();
}
-void CAxisSettingsDlg::SetLabelColor(CBLLabel& label, COLORREF clr)
+void CAxisSettingsDlg::SetLabelColor(CBLLabel& label, COLORREF color)
{
- label.SetBkColor(clr);
- label.Invalidate(); // 鏍囪鍖哄煙鏃犳晥
- label.UpdateWindow(); // 绔嬪嵆鍒锋柊
+ label.SetBkColor(color);
+ label.Invalidate(); // 鏍囪鍖哄煙鏃犳晥
+ label.UpdateWindow(); // 绔嬪嵆鍒锋柊
}
void CAxisSettingsDlg::updatePageButtonStates()
@@ -545,22 +558,21 @@
});
// 鍐欏叆瀹氫綅鐐规暟鎹�
- /*
int positionStartAddress = startAddress + 100;
for (size_t i = 0; i < axisData.positions.size(); ++i) {
const auto& position = axisData.positions[i];
- unsigned int positionAddress = positionStartAddress + (i * 4);
+ unsigned int positionAddress = positionStartAddress + (i * 2);
- m_pPLC->writeWord(component, positionAddress, (int)position.second, [i](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+ m_pPLC->writeDWord(component, positionAddress, (int)(position.second * 1000), [i, positionAddress](IMcChannel* pChannel, int addr, DWORD value, int flag) {
if (flag == 0) {
- TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, addr, value);
+ TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, positionAddress, value);
}
else {
- TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, addr, flag);
+ TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, positionAddress, flag);
}
});
}
- */
+
}
void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
@@ -582,11 +594,12 @@
}
// 鏍规嵁鎿嶄綔绫诲瀷璁＄畻鐩爣鍦板潃
- char szWrite[4] = {0x0, 0x0, 0x0, 0x0};
+ int bitIndex = 0;
+ char szWrite[4] = { 0x0, 0x0, 0x0, 0x0 };
switch (eOpType) {
case AxisOperationType::OPR:
- startAddress += 0; // OPR 淇″彿鍦板潃 0,闂姩淇℃伅04.0
- szWrite[0] = 0x1;
+ startAddress += 0; // OPR 淇″彿鍦板潃 0,闂姩淇℃伅06.0
+ szWrite[0] = bPressed ? 0x1 : 0;
break;
case AxisOperationType::JOG_ADD:
startAddress += 01; // JOG+ 淇″彿鍦板潃 c
@@ -597,22 +610,21 @@
szWrite[1] = bPressed ? 0x20 : 0;
break;
case AxisOperationType::STOP:
- startAddress += 14; // STOP 淇″彿鍦板潃
+ startAddress += 05; // STOP 淇″彿鍦板潃 5.e
+ szWrite[1] = bPressed ? 0x40 : 0;
+ break;
+ case AxisOperationType::SEV_ON:
+ startAddress += 01; // SEV_ON 淇″彿鍦板潃 1.a
+ szWrite[1] = bPressed ? 0x04 : 0;
break;
case AxisOperationType::POSITION_1:
- startAddress += 16; // 瀹氫綅鐐� 1 淇″彿鍦板潃
- break;
case AxisOperationType::POSITION_2:
- startAddress += 18; // 瀹氫綅鐐� 2 淇″彿鍦板潃
- break;
case AxisOperationType::POSITION_3:
- startAddress += 20; // 瀹氫綅鐐� 3 淇″彿鍦板潃
- break;
case AxisOperationType::POSITION_4:
- startAddress += 22; // 瀹氫綅鐐� 4 淇″彿鍦板潃
- break;
case AxisOperationType::POSITION_5:
- startAddress += 24; // 瀹氫綅鐐� 5 淇″彿鍦板潃
+ startAddress += ((m_currentPage - 1) * 5 + ((int)eOpType - (int)AxisOperationType::POSITION_1 + 1)) / 16;
+ bitIndex = ((m_currentPage-1) * 5 + ((int)eOpType - (int)AxisOperationType::POSITION_1 + 1)) % 16;
+ if(bPressed) CToolUnits::setBit(szWrite, bitIndex);
break;
default:
AfxMessageBox(_T("鏈煡鎿嶄綔绫诲瀷锛�"));
@@ -631,7 +643,7 @@
}
void CAxisSettingsDlg::readPLCDataToUI(int nAxisId)
-{
+{
// 浠� RecipeManager 鑾峰彇杞存暟鎹�
RecipeManager& recipeManager = RecipeManager::getInstance();
auto axisData = recipeManager.getAxis(nAxisId);
@@ -644,80 +656,30 @@
endAddress = startAddress + 300;
readSize = (endAddress - startAddress + 1) * 2;
- {
- auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
- if (nDataSize == readSize && flag == 0 && ::IsWindow(m_hWnd)) {
- double fCurPos = CToolUnits::toInt32(&pData[20*2]) * 0.001;
- double fManualSpeed = CToolUnits::toInt32(&pData[82 * 2]) * 0.001;
- double fAutoSpeed = CToolUnits::toInt32(&pData[84 * 2]) * 0.001;
- double fPrm = CToolUnits::toInt32(&pData[50 * 2]) * 0.1;
- int nLoad = CToolUnits::toInt16(&pData[54 * 2]);
- int nErrCode = CToolUnits::toInt16(&pData[26 * 2]);
- int nAlarmCode = CToolUnits::toInt16(&pData[27 * 2]);
- CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, fCurPos);
- CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, fManualSpeed);
- CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, fAutoSpeed);
- CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, fPrm);
- SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, nLoad);
- SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, nErrCode);
- SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, nAlarmCode);
+ auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
+ if (nDataSize == readSize && flag == 0 && ::IsWindow(m_hWnd)) {
+ m_fCurPos = CToolUnits::toInt32(&pData[20 * 2]) * 0.001;
+ m_fManualSpeed = CToolUnits::toInt32(&pData[82 * 2]) * 0.001;
+ m_fAutoSpeed = CToolUnits::toInt32(&pData[84 * 2]) * 0.001;
+ m_fPrm = CToolUnits::toInt32(&pData[50 * 2]) * 0.1;
+ m_nLoad = CToolUnits::toInt16(&pData[54 * 2]);
+ m_nErrCode = CToolUnits::toInt16(&pData[26 * 2]);
+ m_nAlarmCode = CToolUnits::toInt16(&pData[27 * 2]);
- // OPR 淇″彿
- BOOL bFLS = CToolUnits::getBit(pData[10 * 2], 1);
- if (bFLS) {
- SetLabelColor(m_staticFLS, RGB(0, 255, 0));
- }
- else {
- SetLabelColor(m_staticFLS, RGB(0, 180, 0));
- }
+ m_bSEV = CToolUnits::getBit(pData[1 * 2 + 1], 0xa - 8);
+ m_bFLS = CToolUnits::getBit(pData[10 * 2], 1);
+ m_bDOG = CToolUnits::getBit(pData[10 * 2], 6);
+ m_bRLS = CToolUnits::getBit(pData[10 * 2], 0);
+ m_bReady = CToolUnits::getBit(pData[10 * 2 + 1], 0xA - 8);
+ m_bBusy = CToolUnits::getBit(pData[10 * 2 + 1], 0xB - 8);
+ m_bErr = CToolUnits::getBit(pData[10 * 2 + 1], 0xF - 8);
- BOOL bDOG = CToolUnits::getBit(pData[10 * 2], 6);
- if (bDOG) {
- SetLabelColor(m_staticDOG, RGB(0, 255, 0));
- }
- else {
- SetLabelColor(m_staticDOG, RGB(0, 180, 0));
- }
-
- BOOL bRLS = CToolUnits::getBit(pData[10 * 2], 0);
- if (bRLS) {
- SetLabelColor(m_staticRLS, RGB(0, 255, 0));
- }
- else {
- SetLabelColor(m_staticRLS, RGB(0, 180, 0));
- }
-
- BOOL bReady = CToolUnits::getBit(pData[10 * 2 + 1], 0xA - 8);
- if (bReady) {
- SetLabelColor(m_staticReady, RGB(0, 255, 0));
- }
- else {
- SetLabelColor(m_staticReady, RGB(0, 180, 0));
- }
-
- BOOL bBusy = CToolUnits::getBit(pData[10 * 2 + 1], 0xB - 8);
- if (bBusy) {
- SetLabelColor(m_staticBusy, RGB(0, 255, 0));
- }
- else {
- SetLabelColor(m_staticBusy, RGB(0, 180, 0));
- }
-
- BOOL bErr = CToolUnits::getBit(pData[10 * 2 + 1], 0xF - 8);
- if (bErr) {
- SetLabelColor(m_staticErr, RGB(255, 0, 0));
- }
- else {
- SetLabelColor(m_staticErr, RGB(0, 180, 0));
- }
-
- m_bJogAddState = CToolUnits::getBit(pData[1 + 1], 0xC - 8); // 1.D
- m_bJogSubState = CToolUnits::getBit(pData[1+1], 0xD - 8); // 1.D
- }
- };
- m_pPLC->readData(component, startAddress, readSize, funOnReadData);
- }
+ PostMessage(ID_MSG_UPDATA_DATA_TO_UI);
+ }
+ };
+ m_pPLC->readData(component, startAddress, readSize, funOnReadData);
}
+
BEGIN_MESSAGE_MAP(CAxisSettingsDlg, CDialogEx)
ON_BN_CLICKED(IDC_BUTTON_AXIS_LAST, &CAxisSettingsDlg::OnBnClickedButtonAxisLast)
@@ -736,10 +698,13 @@
ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_STOP, &CAxisSettingsDlg::OnBnClickedButtonAxisTestStop)
ON_CBN_SELCHANGE(IDC_COMBO_AXIS_NAME, &CAxisSettingsDlg::OnSelchangeComboAxisName)
ON_BN_CLICKED(IDC_BUTTON_AXIS_SAVE, &CAxisSettingsDlg::OnBnClickedButtonAxisSave)
+ ON_MESSAGE(ID_MSG_UPDATA_DATA_TO_UI, &CAxisSettingsDlg::OnUpdateDataToUI)
ON_WM_SIZE()
ON_WM_CTLCOLOR()
ON_WM_SIZING()
ON_WM_TIMER()
+ ON_WM_CLOSE()
+ ON_BN_CLICKED(IDC_BUTTON_AXIS_SEV, &CAxisSettingsDlg::OnBnClickedButtonAxisSev)
END_MESSAGE_MAP()
@@ -758,7 +723,7 @@
// 璁剧疆娴嬭瘯鐘舵��
CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
for (auto pLabel : pLabels) {
- pLabel->SetBkColor(RGB(255, 255, 255));
+ pLabel->SetBkColor(RGB(0, 180, 0));
pLabel->ModifyStyle(0, SS_NOTIFY);
pLabel->SetTextColor(RGB(255, 255, 255));
pLabel->SetAlignment(AlignCenter);
@@ -824,54 +789,25 @@
{
// TODO: 鍦ㄦ娣诲姞涓撶敤浠ｇ爜鍜�/鎴栬皟鐢ㄥ熀绫�
- if (pMsg->message == WM_LBUTTONDOWN)
- {
- if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
- {
- int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
- if (!m_bJogAddState) {
- m_bJogAddState = !m_bJogAddState;
- Sleep(nSleep < 0 ? 0 : nSleep);
- handleAxisOperation(AxisOperationType::JOG_ADD, true);
- m_ullJogPressedTick = GetTickCount64();
- TRACE("JOG+ 鎸夐挳鎸変笅 %d\n", nSleep);
- }
+ if (pMsg->message == WM_LBUTTONDOWN) {
+ if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
+ TRACE("JOG+ 鎸夐挳鎸変笅\n");
+ handleAxisOperation(AxisOperationType::JOG_ADD, true);
}
- else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
- {
- int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
- if (!m_bJogSubState) {
- m_bJogSubState = !m_bJogSubState;
- Sleep(nSleep < 0 ? 0 : nSleep);
- handleAxisOperation(AxisOperationType::JOG_SUB, true);
- m_ullJogPressedTick = GetTickCount64();
- TRACE("JOG- 鎸夐挳鎸変笅%d\n", nSleep);
- }
+ else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+ TRACE("JOG- 鎸夐挳鎸変笅\n");
+ // 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
+ handleAxisOperation(AxisOperationType::JOG_SUB, true);
}
}
- else if (pMsg->message == WM_LBUTTONUP)
- {
- if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
- {
- int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
- if (m_bJogAddState) {
- m_bJogAddState = !m_bJogAddState;
- Sleep(nSleep < 0 ? 0 : nSleep);
- handleAxisOperation(AxisOperationType::JOG_ADD, false);
- m_ullJogPressedTick = GetTickCount64();
- TRACE("JOG+ 鎸夐挳鏉惧紑 %d\n", nSleep);
- }
+ else if (pMsg->message == WM_LBUTTONUP) {
+ if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
+ TRACE("JOG+ 鎸夐挳鏉惧紑\n");
+ handleAxisOperation(AxisOperationType::JOG_ADD, false);
}
- else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
- {
- int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
- if (m_bJogSubState) {
- m_bJogSubState = !m_bJogSubState;
- Sleep(nSleep < 0 ? 0 : nSleep);
- handleAxisOperation(AxisOperationType::JOG_SUB, false);
- m_ullJogPressedTick = GetTickCount64();
- TRACE("JOG- 鎸夐挳鏉惧紑%d\n", nSleep);
- }
+ else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+ TRACE("JOG- 鎸夐挳鏉惧紑\n");
+ handleAxisOperation(AxisOperationType::JOG_SUB, false);
}
}
@@ -894,7 +830,7 @@
AdjustControls(dScaleX, dScaleY);
// 鍔ㄦ�佽皟鏁村悇涓� CBLLabel 鐨勫瓧浣撳ぇ灏�
- CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticBusy };
+ CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
for (auto pLabel : pLabels) {
AdjustLabelFont(*pLabel);
}
@@ -949,90 +885,103 @@
void CAxisSettingsDlg::OnBnClickedButtonAxisLast()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //updateAxisSelection(-1);
+ updateAxisSelection(-1);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisNext()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //updateAxisSelection(1);
+ updateAxisSelection(1);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup1()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //switchToPage(1);
+ switchToPage(1);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup2()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //switchToPage(2);
+ switchToPage(2);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup3()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //switchToPage(3);
+ switchToPage(3);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup4()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //switchToPage(4);
+ switchToPage(4);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup5()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //switchToPage(5);
+ switchToPage(5);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint1()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //handleAxisOperation(AxisOperationType::POSITION_1, true);
+ handleAxisOperation(AxisOperationType::POSITION_1, true);
+ Sleep(200);
+ handleAxisOperation(AxisOperationType::POSITION_1, false);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //handleAxisOperation(AxisOperationType::POSITION_2, true);
+ handleAxisOperation(AxisOperationType::POSITION_2, true);
+ Sleep(200);
+ handleAxisOperation(AxisOperationType::POSITION_2, false);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint3()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //handleAxisOperation(AxisOperationType::POSITION_3, true);
+ handleAxisOperation(AxisOperationType::POSITION_3, true);
+ Sleep(200);
+ handleAxisOperation(AxisOperationType::POSITION_3, false);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint4()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //handleAxisOperation(AxisOperationType::POSITION_4, true);
+ handleAxisOperation(AxisOperationType::POSITION_4, true);
+ Sleep(200);
+ handleAxisOperation(AxisOperationType::POSITION_4, false);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //handleAxisOperation(AxisOperationType::POSITION_5, true);
+ handleAxisOperation(AxisOperationType::POSITION_5, true);
+ Sleep(200);
+ handleAxisOperation(AxisOperationType::POSITION_5, false);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //handleAxisOperation(AxisOperationType::OPR, true);
+ handleAxisOperation(AxisOperationType::OPR, true);
+ Sleep(200);
+ handleAxisOperation(AxisOperationType::OPR, false);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisTestStop()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //handleAxisOperation(AxisOperationType::STOP, true);
+ handleAxisOperation(AxisOperationType::STOP, true);
+ Sleep(200);
+ handleAxisOperation(AxisOperationType::STOP, false);
}
void CAxisSettingsDlg::OnSelchangeComboAxisName()
{
-
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
int axisId = getCurrentSelectedAxisID();
if (axisId == -1) {
@@ -1047,7 +996,6 @@
void CAxisSettingsDlg::OnBnClickedButtonAxisSave()
{
-
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
int axisId = getCurrentSelectedAxisID();
if (axisId == -1) {
@@ -1076,17 +1024,88 @@
AfxMessageBox(cstrMessage);
}
+LRESULT CAxisSettingsDlg::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam)
+{
+ CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, m_fCurPos);
+ CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, m_fManualSpeed);
+ CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, m_fAutoSpeed);
+ CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, m_fPrm);
+ SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, m_nLoad);
+ SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, m_nErrCode);
+ SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, m_nAlarmCode);
+
+ //OPR 淇″彿
+ if (m_bFLS) {
+ SetLabelColor(m_staticFLS, RGB(0, 255, 0));
+ }
+ else {
+ SetLabelColor(m_staticFLS, RGB(0, 180, 0));
+ }
+
+ if (m_bDOG) {
+ SetLabelColor(m_staticDOG, RGB(0, 255, 0));
+ }
+ else {
+ SetLabelColor(m_staticDOG, RGB(0, 180, 0));
+ }
+
+ if (m_bRLS) {
+ SetLabelColor(m_staticRLS, RGB(0, 255, 0));
+ }
+ else {
+ SetLabelColor(m_staticRLS, RGB(0, 180, 0));
+ }
+
+ if (m_bReady) {
+ SetLabelColor(m_staticReady, RGB(0, 255, 0));
+ }
+ else {
+ SetLabelColor(m_staticReady, RGB(0, 180, 0));
+ }
+
+ if (m_bBusy) {
+ SetLabelColor(m_staticBusy, RGB(0, 255, 0));
+ }
+ else {
+ SetLabelColor(m_staticBusy, RGB(0, 180, 0));
+ }
+
+ if (m_bErr) {
+ SetLabelColor(m_staticErr, RGB(255, 0, 0));
+ }
+ else {
+ SetLabelColor(m_staticErr, RGB(0, 180, 0));
+ }
+
+ return 0;
+}
+
void CAxisSettingsDlg::OnTimer(UINT_PTR nIDEvent)
{
if (TIMER_READ_PLC_DATA == nIDEvent) {
ASSERT(m_pPLC);
int nAxisId = getCurrentSelectedAxisID();
- if (nAxisId != -1) {
- readPLCDataToUI(nAxisId);
+ if (nAxisId == -1) {
+ return;
}
+
+ readPLCDataToUI(nAxisId);
}
-
CDialogEx::OnTimer(nIDEvent);
}
+
+void CAxisSettingsDlg::OnClose()
+{
+ // TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠ｇ爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
+ KillTimer(TIMER_READ_PLC_DATA);
+
+ CDialogEx::OnClose();
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
+}
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