From f89766c67e39852650fe55cdfee371a204b2b01d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 18:04:45 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 325 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 247 insertions(+), 78 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index adc83f2..b54b4b1 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -9,9 +9,8 @@
#include <cctype>
#include <algorithm>
-#define TIMER_INIT 1
-#define TIMER_READ_PLC_DATA 2
-
+#define TIMER_INIT 1
+#define TIMER_READ_PLC_DATA 2
#define ID_MSG_UPDATA_DATA_TO_UI WM_USER + 101
@@ -43,6 +42,9 @@
for (int i = 0; i < BTN_MAX; i++) {
m_pBlBtns[i] = new CBlButton();
}
+ for (int i = 0; i < 6; i++) {
+ m_pBlLabels[i] = new CBLLabel();
+ }
}
CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -57,6 +59,10 @@
for (int i = 0; i < BTN_MAX; i++) {
delete m_pBlBtns[i];
+ }
+
+ for (int i = 0; i < 6; i++) {
+ delete m_pBlLabels[i];
}
}
@@ -74,12 +80,6 @@
void CAxisSettingsDlg::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_STATIC_AXIS_TEST_FLS, m_staticFLS);
- DDX_Control(pDX, IDC_STATIC_AXIS_TEST_DOG, m_staticDOG);
- DDX_Control(pDX, IDC_STATIC_AXIS_TEST_RLS, m_staticRLS);
- DDX_Control(pDX, IDC_STATIC_AXIS_TEST_READY, m_staticReady);
- DDX_Control(pDX, IDC_STATIC_AXIS_TEST_BUSY, m_staticBusy);
- DDX_Control(pDX, IDC_STATIC_AXIS_TEST_ERR, m_staticErr);
DDX_Control(pDX, IDC_COMBO_AXIS_NAME, m_comboAxisNO);
DDX_Control(pDX, IDC_STATIC_AXIS_NUMBER, m_staticAxisNO);
DDX_Control(pDX, IDC_STATIC_AXIS_DESCRIP, m_staticAxisDescription);
@@ -227,6 +227,16 @@
}
}
+void CAxisSettingsDlg::HideEditCursor(int nCtrlID)
+{
+ CEdit* pEdit = (CEdit*)GetDlgItem(nCtrlID);
+ if (pEdit && pEdit->GetSafeHwnd()) {
+ pEdit->EnableWindow(FALSE); // 绂佺敤鎺т欢
+ pEdit->SetReadOnly(TRUE); // 璁剧疆涓哄彧璇�
+ pEdit->HideCaret(); // 闅愯棌鍏夋爣
+ }
+}
+
int CAxisSettingsDlg::getCurrentSelectedAxisID()
{
int currentIndex = m_comboAxisNO.GetCurSel();
@@ -280,14 +290,14 @@
};
// 鏇存柊鎺т欢鏄剧ず
- m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str())); // 杞寸紪鍙�
- m_staticAxisDescription.SetWindowText(CString(axisDetails.description.c_str())); // 杞存弿杩�
- m_staticStartAddress.SetWindowText(CString(axisDetails.startAddress.c_str())); // 璧峰鍦板潃
- m_editJogDistance.SetWindowText(formatDouble(axisDetails.jogDistance)); // 寰姩閲�
- m_editManualSpeed.SetWindowText(formatDouble(axisDetails.manualSpeed)); // 鎵嬪姩閫熷害
- m_editAutoSpeed.SetWindowText(formatDouble(axisDetails.autoSpeed)); // 鑷姩閫熷害
- m_editAccelerationTime.SetWindowText(formatDouble(axisDetails.accelerationTime)); // 鍔犻�熸椂闂�
- m_editDecelerationTime.SetWindowText(formatDouble(axisDetails.decelerationTime)); // 鍑忛�熸椂闂�
+ m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str())); // 杞寸紪鍙�
+ m_staticAxisDescription.SetWindowText(CString(axisDetails.description.c_str())); // 杞存弿杩�
+ m_staticStartAddress.SetWindowText(CString(axisDetails.startAddress.c_str())); // 璧峰鍦板潃
+ m_editJogDistance.SetWindowText(formatDouble(axisDetails.jogDistance.currentValue)); // 寰姩閲�
+ m_editManualSpeed.SetWindowText(formatDouble(axisDetails.manualSpeed.currentValue)); // 鎵嬪姩閫熷害
+ m_editAutoSpeed.SetWindowText(formatDouble(axisDetails.autoSpeed.currentValue)); // 鑷姩閫熷害
+ m_editAccelerationTime.SetWindowText(formatDouble(axisDetails.accelerationTime.currentValue)); // 鍔犻�熸椂闂�
+ m_editDecelerationTime.SetWindowText(formatDouble(axisDetails.decelerationTime.currentValue)); // 鍑忛�熸椂闂�
}
void CAxisSettingsDlg::refreshPositionDetails(int nAxisId, int pageNumber)
@@ -312,17 +322,62 @@
CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
if (i < positions.size()) {
- CString description = CString(positions[i].first.c_str());
- CString value;
- value.Format(_T("%.3f"), positions[i].second);
+ const PositionRange& position = positions[i];
+ // 鏄剧ず瀹氫綅鐐圭殑鎻忚堪
+ CString description = CString(position.description.c_str());
if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(description);
+
+ // 鏄剧ず瀹氫綅鐐圭殑褰撳墠浣嶇疆
+ CString value;
+ value.Format(_T("%.3f"), position.range.currentValue);
if (pPositionCtrl) pPositionCtrl->SetWindowText(value);
}
else {
+ // 娓呯┖鎺т欢鍐呭
if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(_T(""));
if (pPositionCtrl) pPositionCtrl->SetWindowText(_T(""));
}
+ }
+}
+
+void CAxisSettingsDlg::UpdatePositionRange(PositionRange& position, int pageNumber, int pageSize, int currentIndex)
+{
+ // 鑾峰彇褰撳墠杈撳叆妗嗕腑鐨勬枃鏈�
+ CString strText;
+ GetDlgItem(IDC_EDIT_AXIS_CURR_POS)->GetWindowText(strText);
+ if (strText.IsEmpty()) {
+ return;
+ }
+
+ CString descriptionCtrlName, positionCtrlName;
+ descriptionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), currentIndex + 1);
+ positionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), currentIndex + 1);
+
+ UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
+ UINT positionCtrlId = FindIDByName(positionCtrlName);
+
+ CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
+ CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
+
+ if (pDescriptionCtrl == nullptr || pPositionCtrl == nullptr) {
+ return;
+ }
+
+ double enteredValue = _ttof(strText);
+ double minValue = position.range.minValue;
+ double maxValue = position.range.maxValue;
+
+ // 鍒ゆ柇杈撳叆鐨勫�兼槸鍚﹀湪鍚堟硶鑼冨洿鍐�
+ if (enteredValue < minValue || enteredValue > maxValue) {
+ CString strError;
+ strError.Format(_T("瀹氫綅鐐圭殑鍊煎繀椤诲湪 %f 鍜� %f 涔嬮棿锛�"), minValue, maxValue);
+ pDescriptionCtrl->SetWindowText(strError);
+ }
+ else {
+ position.range.currentValue = enteredValue;
+ pDescriptionCtrl->SetWindowText(CString(position.description.c_str()));
+ pPositionCtrl->SetWindowText(strText);
}
}
@@ -358,45 +413,49 @@
// 鑾峰彇鐣岄潰涓婄殑淇敼鍙傛暟
CString text;
m_editManualSpeed.GetWindowText(text);
- axisData.manualSpeed = _ttof(text);
+ axisData.manualSpeed.currentValue = _ttof(text);
m_editAutoSpeed.GetWindowText(text);
- axisData.autoSpeed = _ttof(text);
+ axisData.autoSpeed.currentValue = _ttof(text);
m_editAccelerationTime.GetWindowText(text);
- axisData.accelerationTime = _ttof(text);
+ axisData.accelerationTime.currentValue = _ttof(text);
m_editDecelerationTime.GetWindowText(text);
- axisData.decelerationTime = _ttof(text);
+ axisData.decelerationTime.currentValue = _ttof(text);
m_editJogDistance.GetWindowText(text);
- axisData.jogDistance = _ttof(text);
+ axisData.jogDistance.currentValue = _ttof(text);
// 鏇存柊瀹氫綅鐐规暟鎹�
for (int i = 0; i < pageSize; ++i) {
int index = (m_currentPage - 1) * pageSize + i;
if (index < axisData.positions.size()) {
- CString descriptionName, positionName;
+ // 鏋勫缓鎺т欢鍚嶇О
+ CString descriptionName, positionName, minValueName, maxValueName;
descriptionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), i + 1);
positionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
+ // 鑾峰彇鎺т欢
CEdit* pDescriptionEdit = (CEdit*)GetDlgItem(FindIDByName(descriptionName));
CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
if (pDescriptionEdit && pPositionEdit) {
- CString description, positionValue;
+ CString description, positionValue, minValue, maxValue;
+
+ // 鑾峰彇鎺т欢涓殑鏂囨湰
pDescriptionEdit->GetWindowText(description);
pPositionEdit->GetWindowText(positionValue);
// 鏇存柊 RecipeManager 涓殑鏁版嵁
- axisData.positions[index].first = CT2A(description);
- axisData.positions[index].second = _ttof(positionValue);
+ axisData.positions[index].description = CT2A(description);
+ axisData.positions[index].range.currentValue = _ttof(positionValue);
}
}
}
- // 淇濆瓨鍥� RecipeManager
+ // 淇濆瓨 RecipeManager
recipeManager.updateAxis(axisData);
}
@@ -510,7 +569,7 @@
}
// 鍐欏叆鎵嬪姩閫熷害
- m_pPLC->writeDWord(component, startAddress + 82, (int)axisData.manualSpeed * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+ m_pPLC->writeDWord(component, startAddress + 82, (int)axisData.manualSpeed.currentValue * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
if (flag == 0) {
TRACE("\n鍐欏叆鎴愬姛: 鎵嬪姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
}
@@ -520,7 +579,7 @@
});
// 鍐欏叆鑷姩閫熷害
- m_pPLC->writeDWord(component, startAddress + 84, (int)(axisData.autoSpeed * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+ m_pPLC->writeDWord(component, startAddress + 84, (int)(axisData.autoSpeed.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
if (flag == 0) {
TRACE("\n鍐欏叆鎴愬姛: 鑷姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
}
@@ -530,7 +589,7 @@
});
// 鍐欏叆鍔犻�熸椂闂�, 杞崲涓烘绉�
- m_pPLC->writeDWord(component, startAddress + 62, (int)(axisData.accelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+ m_pPLC->writeDWord(component, startAddress + 62, (int)(axisData.accelerationTime.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
if (flag == 0) {
TRACE("\n鍐欏叆鎴愬姛: 鍔犻�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
}
@@ -540,7 +599,7 @@
});
// 鍐欏叆鍑忛�熸椂闂�, 杞崲涓烘绉�
- m_pPLC->writeDWord(component, startAddress + 64, (int)(axisData.decelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+ m_pPLC->writeDWord(component, startAddress + 64, (int)(axisData.decelerationTime.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
if (flag == 0) {
TRACE("\n鍐欏叆鎴愬姛: 鍑忛�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
}
@@ -550,7 +609,7 @@
});
// 鍐欏叆寰姩閲�
- m_pPLC->writeWord(component, startAddress + 81, (int)(axisData.jogDistance * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+ m_pPLC->writeWord(component, startAddress + 81, (int)(axisData.jogDistance.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
if (flag == 0) {
TRACE("\n鍐欏叆鎴愬姛: 寰姩閲�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
}
@@ -565,16 +624,16 @@
const auto& position = axisData.positions[i];
unsigned int positionAddress = positionStartAddress + (i * 2);
- m_pPLC->writeDWord(component, positionAddress, (int)(position.second * 1000), [i, positionAddress](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+ double valueToWrite = position.range.currentValue;
+ m_pPLC->writeDWord(component, positionAddress, (int)(valueToWrite * 1000), [i, positionAddress](IMcChannel* pChannel, int addr, DWORD value, int flag) {
if (flag == 0) {
- TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, positionAddress, value);
+ TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, positionAddress, value);
}
else {
- TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, positionAddress, flag);
+ TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, positionAddress, flag);
}
});
}
-
}
void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
@@ -722,9 +781,31 @@
strTitle.Format(_T("Axis璁惧畾(閰嶆柟: %s)"), m_strRecipeName);
SetWindowText(strTitle);
+ // 闅愯棌鍏夋爣
+ //HideEditCursor(IDC_EDIT_AXIS_CURR_POS);
+ HideEditCursor(IDC_EDIT_AXIS_CURR_MANUAL_SPEED);
+ HideEditCursor(IDC_EDIT_AXIS_CURR_AUTO_SPEED);
+ HideEditCursor(IDC_EDIT_AXIS_CURR_ROTA_SPEED);
+ HideEditCursor(IDC_EDIT_AXIS_CURR_LOAD);
+ HideEditCursor(IDC_EDIT_AXIS_CURR_ERROR_NUMBER);
+ HideEditCursor(IDC_EDIT_AXIS_CURR_ALARM_NUMBER);
+
+ // 娴嬭瘯
+ {
+ CEdit* pEdit = (CEdit*)GetDlgItem(IDC_EDIT_AXIS_CURR_POS);
+ pEdit->EnableWindow(TRUE);
+ pEdit->SetReadOnly(FALSE);
+ }
+
// 璁剧疆娴嬭瘯鐘舵��
- CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
- for (auto pLabel : pLabels) {
+ m_pBlLabels[0]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_FLS, this);
+ m_pBlLabels[1]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_DOG, this);
+ m_pBlLabels[2]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_RLS, this);
+ m_pBlLabels[3]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_READY, this);
+ m_pBlLabels[4]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_BUSY, this);
+ m_pBlLabels[5]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_ERR, this);
+
+ for (auto pLabel : m_pBlLabels) {
pLabel->SetBkColor(RGB(0, 180, 0));
pLabel->ModifyStyle(0, SS_NOTIFY);
pLabel->SetTextColor(RGB(255, 255, 255));
@@ -832,26 +913,115 @@
BOOL CAxisSettingsDlg::PreTranslateMessage(MSG* pMsg)
{
// TODO: 鍦ㄦ娣诲姞涓撶敤浠ｇ爜鍜�/鎴栬皟鐢ㄥ熀绫�
+ CWnd* pWnd = CWnd::FromHandle(pMsg->hwnd);
- 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);
+ if (pWnd) {
+ // 鍒ゆ柇榧犳爣鏄惁杩涘叆鎸囧畾鎺т欢鍖哄煙
+ if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1)->m_hWnd ||
+ pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2)->m_hWnd ||
+ pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3)->m_hWnd ||
+ pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4)->m_hWnd ||
+ pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5)->m_hWnd) {
+ RecipeManager& recipeManager = RecipeManager::getInstance();
+ int currentIndex = -1;
+
+ // 鏍规嵁鎺т欢ID纭畾 currentIndex
+ if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1)->m_hWnd) {
+ currentIndex = 0;
+ }
+ else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2)->m_hWnd) {
+ currentIndex = 1;
+ }
+ else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3)->m_hWnd) {
+ currentIndex = 2;
+ }
+ else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4)->m_hWnd) {
+ currentIndex = 3;
+ }
+ else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5)->m_hWnd) {
+ currentIndex = 4;
+ }
+
+ if (currentIndex == -1) {
+ return CDialogEx::PreTranslateMessage(pMsg);
+ }
+
+ CString descriptionCtrlName, positionCtrlName;
+ descriptionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), currentIndex + 1);
+ positionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), currentIndex + 1);
+
+ UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
+ UINT positionCtrlId = FindIDByName(positionCtrlName);
+
+ CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
+ CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
+
+ if (pDescriptionCtrl == nullptr || pPositionCtrl == nullptr) {
+ return CDialogEx::PreTranslateMessage(pMsg);
+ }
+
+ PositionRange& position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, 5, currentIndex);
+ if (pMsg->message == WM_LBUTTONDOWN || pMsg->message == WM_LBUTTONDBLCLK) {
+ // 澶勭悊榧犳爣鐐瑰嚮浜嬩欢
+ // 璁剧疆榧犳爣涓虹澶村厜鏍�
+ ::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
+
+ CString strText;
+ GetDlgItem(IDC_EDIT_AXIS_CURR_POS)->GetWindowText(strText);
+ if (strText.IsEmpty()) {
+ return CDialogEx::PreTranslateMessage(pMsg);;
+ }
+
+ double enteredValue = _ttof(strText);
+ double minValue = position.range.minValue;
+ double maxValue = position.range.maxValue;
+
+ // 鍒ゆ柇杈撳叆鐨勫�兼槸鍚﹀湪鍚堟硶鑼冨洿鍐�
+ if (enteredValue < minValue || enteredValue > maxValue) {
+ CString strError;
+ strError.Format(_T("瀹氫綅鐐圭殑鍊煎繀椤诲湪 %f 鍜� %f 涔嬮棿锛�"), minValue, maxValue);
+ pDescriptionCtrl->SetWindowText(strError);
+ }
+ else {
+ position.range.currentValue = enteredValue;
+ pPositionCtrl->SetWindowText(strText);
+ }
+ }
+ else if (pMsg->message == WM_LBUTTONUP) {
+ // 澶勭悊榧犳爣鎶捣浜嬩欢
+ // 璁剧疆榧犳爣涓烘墜褰㈠厜鏍�
+ ::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND));
+
+ CString strText;
+ strText.Format(_T("%s"), position.description.c_str());
+ pDescriptionCtrl->SetWindowText(strText);
+ }
+ else if (pMsg->message == WM_MOUSEMOVE) {
+ // 澶勭悊榧犳爣绉诲姩浜嬩欢
+ ::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND));
+ }
}
- else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
- TRACE("JOG- 鎸夐挳鎸変笅\n");
- // 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
- handleAxisOperation(AxisOperationType::JOG_SUB, true);
+
+ 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) {
+ 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) {
- TRACE("JOG+ 鎸夐挳鏉惧紑\n");
- handleAxisOperation(AxisOperationType::JOG_ADD, false);
- }
- else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
- TRACE("JOG- 鎸夐挳鏉惧紑\n");
- handleAxisOperation(AxisOperationType::JOG_SUB, false);
+ 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) {
+ TRACE("JOG- 鎸夐挳鏉惧紑\n");
+ handleAxisOperation(AxisOperationType::JOG_SUB, false);
+ }
}
}
@@ -874,8 +1044,7 @@
AdjustControls(dScaleX, dScaleY);
// 鍔ㄦ�佽皟鏁村悇涓� CBLLabel 鐨勫瓧浣撳ぇ灏�
- CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
- for (auto pLabel : pLabels) {
+ for (auto pLabel : m_pBlLabels) {
AdjustLabelFont(*pLabel);
}
@@ -1026,6 +1195,12 @@
m_pBlBtns[BTN_JOG_OPR]->StopFlash();
}
+void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
+}
+
void CAxisSettingsDlg::OnSelchangeComboAxisName()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
@@ -1082,45 +1257,45 @@
//OPR 淇″彿
if (m_bFLS) {
- SetLabelColor(m_staticFLS, RGB(0, 255, 0));
+ SetLabelColor(*m_pBlLabels[0], RGB(0, 255, 0));
}
else {
- SetLabelColor(m_staticFLS, RGB(0, 180, 0));
+ SetLabelColor(*m_pBlLabels[0], RGB(0, 180, 0));
}
if (m_bDOG) {
- SetLabelColor(m_staticDOG, RGB(0, 255, 0));
+ SetLabelColor(*m_pBlLabels[1], RGB(0, 255, 0));
}
else {
- SetLabelColor(m_staticDOG, RGB(0, 180, 0));
+ SetLabelColor(*m_pBlLabels[1], RGB(0, 180, 0));
}
if (m_bRLS) {
- SetLabelColor(m_staticRLS, RGB(0, 255, 0));
+ SetLabelColor(*m_pBlLabels[2], RGB(0, 255, 0));
}
else {
- SetLabelColor(m_staticRLS, RGB(0, 180, 0));
+ SetLabelColor(*m_pBlLabels[2], RGB(0, 180, 0));
}
if (m_bReady) {
- SetLabelColor(m_staticReady, RGB(0, 255, 0));
+ SetLabelColor(*m_pBlLabels[3], RGB(0, 255, 0));
}
else {
- SetLabelColor(m_staticReady, RGB(0, 180, 0));
+ SetLabelColor(*m_pBlLabels[3], RGB(0, 180, 0));
}
if (m_bBusy) {
- SetLabelColor(m_staticBusy, RGB(0, 255, 0));
+ SetLabelColor(*m_pBlLabels[4], RGB(0, 255, 0));
}
else {
- SetLabelColor(m_staticBusy, RGB(0, 180, 0));
+ SetLabelColor(*m_pBlLabels[4], RGB(0, 180, 0));
}
if (m_bErr) {
- SetLabelColor(m_staticErr, RGB(255, 0, 0));
+ SetLabelColor(*m_pBlLabels[5], RGB(255, 0, 0));
}
else {
- SetLabelColor(m_staticErr, RGB(0, 180, 0));
+ SetLabelColor(*m_pBlLabels[5], RGB(0, 180, 0));
}
return 0;
@@ -1148,10 +1323,4 @@
KillTimer(TIMER_READ_PLC_DATA);
CDialogEx::OnClose();
-}
-
-void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
-{
- // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
}
--
Gitblit v1.9.3