From c6edbd1df725b75f0b1ed97ca178ea4e3231b25f Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 09 十二月 2024 14:18:11 +0800
Subject: [PATCH] 1. axis设定先写入PLC，间隔2秒后更新界面和配方 2. IO模块如果是可以点击的信号，移动到控件上鼠标显示点击图标 3. io模块添加圆角功能
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 272 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 191 insertions(+), 81 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index bbddb7b..4b4027d 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -9,6 +9,10 @@
#include <cctype>
#include <algorithm>
+#define COLOR_GREEN_ON RGB(0, 255, 0) // 姝ｅ父鐘舵�佺豢鑹�
+#define COLOR_GREEN_OFF RGB(0, 180, 0) // 鍋忕豢鐘舵��
+#define COLOR_RED RGB(255, 0, 0) // 閿欒鐘舵�佺孩鑹�
+
#define TIMER_INIT 1
#define TIMER_READ_PLC_DATA 2
@@ -39,14 +43,16 @@
m_bReady = FALSE;
m_bBusy = FALSE;
m_bErr = FALSE;
-
- for (int i = 0; i < 9; i++) {
+ for (int i = 0; i < BTN_MAX; i++) {
m_pBlBtns[i] = new CBlButton();
}
- for (int i = 0; i < 6; i++) {
+ for (int i = 0; i < LABEL_MAX; i++) {
m_pBlLabels[i] = new CBLLabel();
}
+
+ m_nBtnsFlashState6 = 0;
+ m_nBtnsFlashState8 = 0;
}
CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -59,11 +65,11 @@
}
m_mapFonts.clear();
- for (int i = 0; i < 9; i++) {
+ for (int i = 0; i < BTN_MAX; i++) {
delete m_pBlBtns[i];
}
- for (int i = 0; i < 6; i++) {
+ for (int i = 0; i < LABEL_MAX; i++) {
delete m_pBlLabels[i];
}
}
@@ -218,9 +224,22 @@
label.UpdateWindow(); // 绔嬪嵆鍒锋柊
}
+void CAxisSettingsDlg::SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse) {
+ SetLabelColor(label, bState ? colorTrue : colorFalse);
+}
+
+void CAxisSettingsDlg::UpdateLabels() {
+ SetLabelColorBasedOnState(*m_pBlLabels[LABEL_FLS], m_bFLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+ SetLabelColorBasedOnState(*m_pBlLabels[LABEL_DOG], m_bDOG, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+ SetLabelColorBasedOnState(*m_pBlLabels[LABEL_RLS], m_bRLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+ SetLabelColorBasedOnState(*m_pBlLabels[LABEL_READY], m_bReady, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+ SetLabelColorBasedOnState(*m_pBlLabels[LABEL_BUSY], m_bBusy, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+ SetLabelColorBasedOnState(*m_pBlLabels[LABEL_ERR], m_bErr, COLOR_RED, COLOR_GREEN_OFF);
+}
+
void CAxisSettingsDlg::updatePageButtonStates()
{
- for (int i = 0; i < 5; ++i) {
+ for (int i = 0; i < AXIS_PAGE_SIZE; ++i) {
BOOL bSelect = (i + 1 == m_currentPage);
m_pBlBtns[i]->SetFaceColor(bSelect ?
BTN_PAGE_FACE_SELECT_COLOR: BTN_PAGE_FACE_NORMAL_COLOR);
@@ -306,7 +325,7 @@
{
RecipeManager& recipeManager = RecipeManager::getInstance();
// 姣忛〉鏄剧ず鐨勫畾浣嶇偣鏁伴噺
- const int pageSize = 5;
+ const int pageSize = AXIS_PAGE_SIZE;
// 鑾峰彇瀹氫綅鐐规暟鎹�
auto positions = recipeManager.getPositions(nAxisId, pageNumber, pageSize);
@@ -407,7 +426,7 @@
void CAxisSettingsDlg::updateDataFromUI(int nAxisId)
{
- const int pageSize = 5; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
+ const int pageSize = AXIS_PAGE_SIZE; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
RecipeManager& recipeManager = RecipeManager::getInstance();
auto axisData = recipeManager.getAxis(nAxisId);
@@ -622,7 +641,7 @@
// 鍐欏叆瀹氫綅鐐规暟鎹�
int positionStartAddress = startAddress + 100;
- for (size_t i = 0; i < axisData.positions.size(); ++i) {
+ for (int i = 0; i < axisData.positions.size(); ++i) {
const auto& position = axisData.positions[i];
unsigned int positionAddress = positionStartAddress + (i * 2);
@@ -709,7 +728,7 @@
{
// 浠� RecipeManager 鑾峰彇杞存暟鎹�
RecipeManager& recipeManager = RecipeManager::getInstance();
- auto axisData = recipeManager.getAxis(nAxisId);
+ AxisInfo axisData = recipeManager.getAxis(nAxisId);
MC::SOFT_COMPONENT component;
int startAddress, endAddress, readSize;
@@ -719,7 +738,7 @@
endAddress = startAddress + 300;
readSize = (endAddress - startAddress + 1) * 2;
- auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
+ auto funOnReadData = [this, nAxisId, 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;
@@ -736,6 +755,33 @@
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);
+
+ // 璁板綍鎸夐挳鍒锋柊鐘舵��
+ // 6,7,8,9涓哄師鐐瑰拰25涓偣浣嶇姸鎬佸拰瀹屾垚鐘舵��
+ // ZR 06.0 鍜� 08.0
+ // 鍥炲師鐐硅繍鍔ㄤ腑锛孼R06.0鍦�0鍜�1涓垏鎹紝鍥炲師鐐瑰畬鎴愶紝 08.0涓�1
+ // 瀹氫綅1
+ // ZR 06.1 鍜� 08.1
+ // ...
+ int b = 6 * 2;
+ m_nBtnsFlashState6 = ((BYTE)pData[b] | (BYTE)pData[b + 1] << 8);
+ m_nBtnsFlashState6 |= ((BYTE)pData[b + 2] << 16 | (BYTE)pData[b + 3] << 24);
+ m_nBtnsFlashState8 = ((BYTE)pData[b + 4] | (BYTE)pData[b + 5] << 8);
+ m_nBtnsFlashState8 |= ((BYTE)pData[b + 6] << 16 | (BYTE)pData[b + 7] << 24);
+
+ AxisInfo axisInfo = RecipeManager::getInstance().getAxis(nAxisId);
+ axisInfo.autoSpeed.currentValue = m_fAutoSpeed; // 鑷姩閫熷害
+ axisInfo.manualSpeed.currentValue = m_fManualSpeed; // 鎵嬪姩閫熷害
+ axisInfo.jogDistance.currentValue = CToolUnits::toInt32(&pData[81 * 2]) * 0.001; // 寰姩閲�
+ axisInfo.accelerationTime.currentValue = CToolUnits::toInt32(&pData[62 * 2]) * 0.001; // 鍔犻�熸椂闂�
+ axisInfo.decelerationTime.currentValue = CToolUnits::toInt32(&pData[64 * 2]) * 0.001; // 鍑忛�熸椂闂�
+
+ // 璇诲彇瀹氫綅鐐规暟鎹�
+ for (int i = 0; i < axisInfo.positions.size(); ++i) {
+ unsigned int positionAddress = 100 + (i * 2);
+ axisInfo.positions[i].range.currentValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+ }
+ RecipeManager::getInstance().updateAxis(axisInfo);
PostMessage(ID_MSG_UPDATA_DATA_TO_UI);
}
@@ -800,12 +846,12 @@
}
// 璁剧疆娴嬭瘯鐘舵��
- 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);
+ m_pBlLabels[LABEL_FLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_FLS, this);
+ m_pBlLabels[LABEL_DOG]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_DOG, this);
+ m_pBlLabels[LABEL_RLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_RLS, this);
+ m_pBlLabels[LABEL_READY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_READY, this);
+ m_pBlLabels[LABEL_BUSY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_BUSY, this);
+ m_pBlLabels[LABEL_ERR]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_ERR, this);
for (auto pLabel : m_pBlLabels) {
pLabel->SetBkColor(RGB(0, 180, 0));
@@ -816,39 +862,57 @@
}
// 鎸夐挳鍒濆鍖�
- m_pBlBtns[0]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, this);
- m_pBlBtns[1]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, this);
- m_pBlBtns[2]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, this);
- m_pBlBtns[3]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, this);
- m_pBlBtns[4]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, this);
- m_pBlBtns[5]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD, this);
- m_pBlBtns[5]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
- m_pBlBtns[5]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
- m_pBlBtns[5]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
- m_pBlBtns[5]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
- m_pBlBtns[5]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
- m_pBlBtns[5]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
- m_pBlBtns[6]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB, this);
- m_pBlBtns[6]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
- m_pBlBtns[6]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
- m_pBlBtns[6]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
- m_pBlBtns[6]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
- m_pBlBtns[6]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
- m_pBlBtns[6]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
- m_pBlBtns[7]->SubclassDlgItem(IDC_BUTTON_AXIS_SEV, this);
- m_pBlBtns[7]->SetFrameColor(BS_NORMAL, BTN_SEV_FRAME_NORMAL);
- m_pBlBtns[7]->SetFrameColor(BS_HOVER, BTN_SEV_FRAME_HOVER);
- m_pBlBtns[7]->SetFrameColor(BS_PRESS, BTN_SEV_FRAME_PRESS);
- m_pBlBtns[7]->SetBkgndColor(BS_NORMAL, BTN_SEV_BKGND_NORMAL);
- m_pBlBtns[7]->SetBkgndColor(BS_HOVER, BTN_SEV_BKGND_HOVER);
- m_pBlBtns[7]->SetBkgndColor(BS_PRESS, BTN_SEV_BKGND_PRESS);
- m_pBlBtns[8]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_STOP, this);
- m_pBlBtns[8]->SetFrameColor(BS_NORMAL, BTN_STOP_FRAME_NORMAL);
- m_pBlBtns[8]->SetFrameColor(BS_HOVER, BTN_STOP_FRAME_HOVER);
- m_pBlBtns[8]->SetFrameColor(BS_PRESS, BTN_STOP_FRAME_PRESS);
- m_pBlBtns[8]->SetBkgndColor(BS_NORMAL, BTN_STOP_BKGND_NORMAL);
- m_pBlBtns[8]->SetBkgndColor(BS_HOVER, BTN_STOP_BKGND_HOVER);
- m_pBlBtns[8]->SetBkgndColor(BS_PRESS, BTN_STOP_BKGND_PRESS);
+ m_pBlBtns[BTN_PAGE1]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, this);
+ m_pBlBtns[BTN_PAGE2]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, this);
+ m_pBlBtns[BTN_PAGE3]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, this);
+ m_pBlBtns[BTN_PAGE4]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, this);
+ m_pBlBtns[BTN_PAGE5]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, this);
+ m_pBlBtns[BTN_JOG_ADD]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD, this);
+ m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+ m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+ m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+ m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+ m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+ m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+ m_pBlBtns[BTN_JOG_SUB]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB, this);
+ m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+ m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+ m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+ m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+ m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+ m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+ m_pBlBtns[BTN_JOG_SEV]->SubclassDlgItem(IDC_BUTTON_AXIS_SEV, this);
+ m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_NORMAL, BTN_SEV_FRAME_NORMAL);
+ m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_HOVER, BTN_SEV_FRAME_HOVER);
+ m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_PRESS, BTN_SEV_FRAME_PRESS);
+ m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_NORMAL, BTN_SEV_BKGND_NORMAL);
+ m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_HOVER, BTN_SEV_BKGND_HOVER);
+ m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_PRESS, BTN_SEV_BKGND_PRESS);
+ m_pBlBtns[BTN_JOG_STOP]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_STOP, this);
+ m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_NORMAL, BTN_STOP_FRAME_NORMAL);
+ m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_HOVER, BTN_STOP_FRAME_HOVER);
+ m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_PRESS, BTN_STOP_FRAME_PRESS);
+ m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_NORMAL, BTN_STOP_BKGND_NORMAL);
+ m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_HOVER, BTN_STOP_BKGND_HOVER);
+ m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_PRESS, BTN_STOP_BKGND_PRESS);
+ m_pBlBtns[BTN_JOG_OPR]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_OPR, this);
+ m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_NORMAL, BTN_OPR_FRAME_NORMAL);
+ m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_HOVER, BTN_OPR_FRAME_HOVER);
+ m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_PRESS, BTN_OPR_FRAME_PRESS);
+ m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_NORMAL, BTN_OPR_BKGND_NORMAL);
+ m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_HOVER, BTN_OPR_BKGND_HOVER);
+ m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_PRESS, BTN_OPR_BKGND_PRESS);
+ static UINT btnPointIds[] = { IDC_BUTTON_AXIS_ANCHOR_POINT1, IDC_BUTTON_AXIS_ANCHOR_POINT2,
+ IDC_BUTTON_AXIS_ANCHOR_POINT3, IDC_BUTTON_AXIS_ANCHOR_POINT4, IDC_BUTTON_AXIS_ANCHOR_POINT5};
+ for (int i = 0; i < 5; i++) {
+ m_pBlBtns[BTN_POINT1 + i]->SubclassDlgItem(btnPointIds[i], this);
+ m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_NORMAL, BTN_POINT_FRAME_NORMAL);
+ m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_HOVER, BTN_POINT_FRAME_HOVER);
+ m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_PRESS, BTN_POINT_FRAME_PRESS);
+ m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_NORMAL, BTN_POINT_BKGND_NORMAL);
+ m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_HOVER, BTN_POINT_BKGND_HOVER);
+ m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_PRESS, BTN_POINT_BKGND_PRESS);
+ }
// 鍒濆鍖栧綋鍓嶉〉闈负绗竴椤�
m_currentPage = 1;
@@ -955,7 +1019,7 @@
return CDialogEx::PreTranslateMessage(pMsg);
}
- PositionRange& position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, 5, currentIndex);
+ PositionRange& position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, AXIS_PAGE_SIZE, currentIndex);
if (pMsg->message == WM_LBUTTONDOWN || pMsg->message == WM_LBUTTONDBLCLK) {
// 澶勭悊榧犳爣鐐瑰嚮浜嬩欢
// 璁剧疆榧犳爣涓虹澶村厜鏍�
@@ -1138,6 +1202,7 @@
handleAxisOperation(AxisOperationType::POSITION_1, true);
Sleep(200);
handleAxisOperation(AxisOperationType::POSITION_1, false);
+ m_pBlBtns[BTN_POINT1]->Flash(1000);
}
void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
@@ -1186,6 +1251,12 @@
handleAxisOperation(AxisOperationType::STOP, true);
Sleep(200);
handleAxisOperation(AxisOperationType::STOP, false);
+ m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+ m_pBlBtns[BTN_POINT1]->StopFlash();
+ m_pBlBtns[BTN_POINT2]->StopFlash();
+ m_pBlBtns[BTN_POINT3]->StopFlash();
+ m_pBlBtns[BTN_POINT3]->StopFlash();
+ m_pBlBtns[BTN_POINT4]->StopFlash();
}
void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
@@ -1223,15 +1294,20 @@
if (ret != IDOK) {
return;
}
+ writeAxisDataToPLC(axisId);
- updateDataFromUI(axisId);
+ Sleep(2000);
+
+ refreshAxisDetails(axisId);
+ refreshPositionDetails(axisId, m_currentPage);
if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
- writeAxisDataToPLC(axisId);
- cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鎴愬姛锛�"), axisId);
+ cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鍒版枃浠舵垚鍔燂紒"), axisId);
SystemLogManager::getInstance().log(SystemLogManager::LogType::Operation, std::string(CT2A(cstrMessage)));
+
+ updateDataFromUI(axisId);
}
else {
- cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟澶辫触锛�"), axisId);
+ cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鍒版枃浠跺け璐ワ紒"), axisId);
SystemLogManager::getInstance().log(SystemLogManager::LogType::Error, std::string(CT2A(cstrMessage)));
}
@@ -1248,47 +1324,81 @@
SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, m_nErrCode);
SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, m_nAlarmCode);
- //OPR 淇″彿
- if (m_bFLS) {
- SetLabelColor(*m_pBlLabels[0], RGB(0, 255, 0));
+ // 鏇存柊Labels鐘舵��
+ UpdateLabels();
+
+ // OPR鎸夐挳鏄惁瑕侀棯鐑佹垨鍋滄闂儊
+ // 06.0鍜�08.0
+ if (m_nBtnsFlashState6 & 0x01) {
+ // 06.0
+ if (!m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+ m_pBlBtns[BTN_JOG_OPR]->Flash(1000);
+ }
}
- else {
- SetLabelColor(*m_pBlLabels[0], RGB(0, 180, 0));
+ else if (m_nBtnsFlashState8 & 0x01) {
+ if (m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+ m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+ }
}
- if (m_bDOG) {
- SetLabelColor(*m_pBlLabels[1], RGB(0, 255, 0));
- }
- else {
- SetLabelColor(*m_pBlLabels[1], RGB(0, 180, 0));
+ int v = 0x02;
+ if (m_currentPage > 1) {
+ v = v << (5 * (m_currentPage - 1));
}
- if (m_bRLS) {
- SetLabelColor(*m_pBlLabels[2], RGB(0, 255, 0));
+ if (m_nBtnsFlashState6 & v) {
+ if (!m_pBlBtns[BTN_POINT1]->IsFlash()) {
+ m_pBlBtns[BTN_POINT1]->Flash(1000);
+ }
}
- else {
- SetLabelColor(*m_pBlLabels[2], RGB(0, 180, 0));
+ else if (m_nBtnsFlashState8 & v) {
+ if (m_pBlBtns[BTN_POINT1]->IsFlash()) {
+ m_pBlBtns[BTN_POINT1]->StopFlash();
+ }
}
- if (m_bReady) {
- SetLabelColor(*m_pBlLabels[3], RGB(0, 255, 0));
+ if (m_nBtnsFlashState6 & (v << 1)) {
+ if (!m_pBlBtns[BTN_POINT2]->IsFlash()) {
+ m_pBlBtns[BTN_POINT2]->Flash(1000);
+ }
}
- else {
- SetLabelColor(*m_pBlLabels[3], RGB(0, 180, 0));
+ else if (m_nBtnsFlashState8 & (v << 1)) {
+ if (m_pBlBtns[BTN_POINT2]->IsFlash()) {
+ m_pBlBtns[BTN_POINT2]->StopFlash();
+ }
}
- if (m_bBusy) {
- SetLabelColor(*m_pBlLabels[4], RGB(0, 255, 0));
+ if (m_nBtnsFlashState6 & (v << 2)) {
+ if (!m_pBlBtns[BTN_POINT3]->IsFlash()) {
+ m_pBlBtns[BTN_POINT3]->Flash(1000);
+ }
}
- else {
- SetLabelColor(*m_pBlLabels[4], RGB(0, 180, 0));
+ else if (m_nBtnsFlashState8 & (v << 2)) {
+ if (m_pBlBtns[BTN_POINT3]->IsFlash()) {
+ m_pBlBtns[BTN_POINT3]->StopFlash();
+ }
}
- if (m_bErr) {
- SetLabelColor(*m_pBlLabels[5], RGB(255, 0, 0));
+ if (m_nBtnsFlashState6 & (v << 3)) {
+ if (!m_pBlBtns[BTN_POINT4]->IsFlash()) {
+ m_pBlBtns[BTN_POINT4]->Flash(1000);
+ }
}
- else {
- SetLabelColor(*m_pBlLabels[5], RGB(0, 180, 0));
+ else if (m_nBtnsFlashState8 & (v << 3)) {
+ if (m_pBlBtns[BTN_POINT4]->IsFlash()) {
+ m_pBlBtns[BTN_POINT4]->StopFlash();
+ }
+ }
+
+ if (m_nBtnsFlashState6 & (v << 4)) {
+ if (!m_pBlBtns[BTN_POINT5]->IsFlash()) {
+ m_pBlBtns[BTN_POINT5]->Flash(1000);
+ }
+ }
+ else if (m_nBtnsFlashState8 & (v << 4)) {
+ if (m_pBlBtns[BTN_POINT5]->IsFlash()) {
+ m_pBlBtns[BTN_POINT5]->StopFlash();
+ }
}
return 0;
--
Gitblit v1.9.3