From 51a915e1487515a626638a73e668b0ada227788e Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 09 十二月 2024 18:16:03 +0800
Subject: [PATCH] 1. 添加axis细部设置界面
---
SourceCode/Bond/BondEq/Resource.h | 0
SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.cpp | 76 +++++++++++++++++++
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 2
SourceCode/Bond/BondEq/BondEq.rc | 0
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 69 +++++++++++-----
SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h | 39 +++++++++
SourceCode/Bond/BondEq/BondEq.vcxproj | 2
7 files changed, 165 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.rc b/SourceCode/Bond/BondEq/BondEq.rc
index 61728c2..faee66e 100644
--- a/SourceCode/Bond/BondEq/BondEq.rc
+++ b/SourceCode/Bond/BondEq/BondEq.rc
Binary files differ
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index f39bd84..b18164e 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -255,6 +255,7 @@
<ClInclude Include="ToolUnits.h" />
<ClInclude Include="TopToolbar.h" />
<ClInclude Include="VerticalLine.h" />
+ <ClInclude Include="View\AxisDetailSettingsDlg.h" />
<ClInclude Include="View\AxisSettingsDlg.h" />
<ClInclude Include="View\ChangePasswordDlg.h" />
<ClInclude Include="View\IOMonitoringDlg.h" />
@@ -331,6 +332,7 @@
<ClCompile Include="ToolUnits.cpp" />
<ClCompile Include="TopToolbar.cpp" />
<ClCompile Include="VerticalLine.cpp" />
+ <ClCompile Include="View\AxisDetailSettingsDlg.cpp" />
<ClCompile Include="View\AxisSettingsDlg.cpp" />
<ClCompile Include="View\ChangePasswordDlg.cpp" />
<ClCompile Include="View\IOMonitoringDlg.cpp" />
diff --git a/SourceCode/Bond/BondEq/Resource.h b/SourceCode/Bond/BondEq/Resource.h
index d27a070..0be8425 100644
--- a/SourceCode/Bond/BondEq/Resource.h
+++ b/SourceCode/Bond/BondEq/Resource.h
Binary files differ
diff --git a/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.cpp
new file mode 100644
index 0000000..29d1963
--- /dev/null
+++ b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.cpp
@@ -0,0 +1,76 @@
+锘�// AxisDetailSettingsDlg.cpp: 瀹炵幇鏂囦欢
+//
+
+#include "stdafx.h"
+#include "BondEq.h"
+#include "afxdialogex.h"
+#include "AxisDetailSettingsDlg.h"
+
+
+// CAxisDetailSettingsDlg 瀵硅瘽妗�
+
+IMPLEMENT_DYNAMIC(CAxisDetailSettingsDlg, CDialogEx)
+
+CAxisDetailSettingsDlg::CAxisDetailSettingsDlg(const CString& strRecipeName, int nAxisNO, CWnd* pParent /*=nullptr*/)
+ : CDialogEx(IDD_DIALOG_AXIS_DETAIL_SETTINGS, pParent)
+{
+ m_strRecipeName = strRecipeName;
+ m_nAxisNO = nAxisNO;
+
+ m_pPLC = nullptr;
+ m_nInitialWidth = 0;
+ m_nInitialHeight = 0;
+}
+
+CAxisDetailSettingsDlg::~CAxisDetailSettingsDlg()
+{
+}
+
+void CAxisDetailSettingsDlg::SetPLC(CPLC* pPLC)
+{
+ ASSERT(pPLC);
+ m_pPLC = pPLC;
+}
+
+void CAxisDetailSettingsDlg::DoDataExchange(CDataExchange* pDX)
+{
+ CDialogEx::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_STATIC_AXIS_NUMBER, m_staticAxisNO);
+ DDX_Control(pDX, IDC_STATIC_AXIS_DESCRIP, m_staticAxisDescription);
+ DDX_Control(pDX, IDC_STATIC_START_ADDRESS, m_staticStartAddress);
+}
+
+
+BEGIN_MESSAGE_MAP(CAxisDetailSettingsDlg, CDialogEx)
+END_MESSAGE_MAP()
+
+
+// CAxisDetailSettingsDlg 娑堟伅澶勭悊绋嬪簭
+
+
+BOOL CAxisDetailSettingsDlg::OnInitDialog()
+{
+ CDialogEx::OnInitDialog();
+
+ // TODO: 鍦ㄦ娣诲姞棰濆鐨勫垵濮嬪寲
+ CString strTitle;
+ strTitle.Format(_T("Axis缁嗛儴璁惧畾(閰嶆柟: %s)"), m_strRecipeName);
+ SetWindowText(strTitle);
+
+ // 鑾峰彇杞存暟鎹�
+ RecipeManager& recipeManager = RecipeManager::getInstance();
+ auto axisDetails = recipeManager.getAxis(m_nAxisNO);
+ if (axisDetails.id == -1) {
+ CString strMsg;
+ strMsg.Format(_T("杞� [%d] 涓嶅瓨鍦紒"), m_nAxisNO);
+ AfxMessageBox(strMsg);
+ return FALSE;
+ }
+
+ m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str())); // 杞寸紪鍙�
+ m_staticAxisDescription.SetWindowText(CString(axisDetails.description.c_str())); // 杞存弿杩�
+ m_staticStartAddress.SetWindowText(CString(axisDetails.startAddress.c_str())); // 璧峰鍦板潃
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
+}
diff --git a/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
new file mode 100644
index 0000000..d375f88
--- /dev/null
+++ b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
@@ -0,0 +1,39 @@
+锘�#pragma once
+#include "afxdialogex.h"
+
+
+// CAxisDetailSettingsDlg 瀵硅瘽妗�
+
+class CAxisDetailSettingsDlg : public CDialogEx
+{
+ DECLARE_DYNAMIC(CAxisDetailSettingsDlg)
+
+public:
+ CAxisDetailSettingsDlg(const CString& strRecipeName, int nAxisNO, CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+ virtual ~CAxisDetailSettingsDlg();
+
+public:
+ void SetPLC(CPLC* pPLC);
+
+// 瀵硅瘽妗嗘暟鎹�
+#ifdef AFX_DESIGN_TIME
+ enum { IDD = IDD_DIALOG_AXIS_DETAIL_SETTINGS };
+#endif
+
+private:
+ CPLC* m_pPLC;
+ int m_nInitialWidth;
+ int m_nInitialHeight;
+
+ // 鏁版嵁
+ int m_nAxisNO;
+ CString m_strRecipeName;
+
+ // 鎺т欢
+ CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
+ virtual BOOL OnInitDialog();
+ DECLARE_MESSAGE_MAP()
+};
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 4b4027d..0a60bd2 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -5,6 +5,7 @@
#include "BondEq.h"
#include "afxdialogex.h"
#include "AxisSettingsDlg.h"
+#include "AxisDetailSettingsDlg.h"
#include "ToolUnits.h"
#include <cctype>
#include <algorithm>
@@ -769,19 +770,19 @@
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; // 鍑忛�熸椂闂�
+ //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);
+ //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);
}
@@ -805,15 +806,17 @@
ON_BN_CLICKED(IDC_BUTTON_AXIS_ANCHOR_POINT5, &CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5)
ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_OPR, &CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr)
ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_STOP, &CAxisSettingsDlg::OnBnClickedButtonAxisTestStop)
+ ON_BN_CLICKED(IDC_BUTTON_AXIS_SEV, &CAxisSettingsDlg::OnBnClickedButtonAxisSev)
ON_CBN_SELCHANGE(IDC_COMBO_AXIS_NAME, &CAxisSettingsDlg::OnSelchangeComboAxisName)
ON_BN_CLICKED(IDC_BUTTON_AXIS_SAVE, &CAxisSettingsDlg::OnBnClickedButtonAxisSave)
+ ON_BN_CLICKED(IDC_BUTTON_AXIS_UPDATE_UI, &CAxisSettingsDlg::OnBnClickedButtonAxisUpdateUi)
+ ON_BN_CLICKED(IDC_BUTTON_AXIS_DETAIL_SETTINGS, &CAxisSettingsDlg::OnBnClickedButtonAxisDetailSettings)
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()
@@ -830,20 +833,13 @@
SetWindowText(strTitle);
// 闅愯棌鍏夋爣
- //HideEditCursor(IDC_EDIT_AXIS_CURR_POS);
+ 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);
- }
// 璁剧疆娴嬭瘯鐘舵��
m_pBlLabels[LABEL_FLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_FLS, this);
@@ -1296,10 +1292,10 @@
}
writeAxisDataToPLC(axisId);
- Sleep(2000);
+ //Sleep(2000);
- refreshAxisDetails(axisId);
- refreshPositionDetails(axisId, m_currentPage);
+ //refreshAxisDetails(axisId);
+ //refreshPositionDetails(axisId, m_currentPage);
if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鍒版枃浠舵垚鍔燂紒"), axisId);
SystemLogManager::getInstance().log(SystemLogManager::LogType::Operation, std::string(CT2A(cstrMessage)));
@@ -1314,6 +1310,33 @@
AfxMessageBox(cstrMessage);
}
+void CAxisSettingsDlg::OnBnClickedButtonAxisUpdateUi()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ int axisId = getCurrentSelectedAxisID();
+ if (axisId == -1) {
+ AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+ return;
+ }
+
+ refreshAxisDetails(axisId);
+ refreshPositionDetails(axisId, m_currentPage);
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisDetailSettings()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ int nAxisId = getCurrentSelectedAxisID();
+ if (nAxisId == -1) {
+ AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+ return;
+ }
+
+ CAxisDetailSettingsDlg dlg(m_strRecipeName, nAxisId, this);
+ dlg.SetPLC(m_pPLC);
+ dlg.DoModal();
+}
+
LRESULT CAxisSettingsDlg::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam)
{
CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, m_fCurPos);
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 5093409..1aa0a27 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -154,6 +154,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