From 35199ad4aaa3f35ff82da77d7108a4e9f136443e Mon Sep 17 00:00:00 2001 From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com> Date: 星期五, 06 十二月 2024 17:49:56 +0800 Subject: [PATCH] 1.修改配方管理模块，定位点等参数有最大值最小值 2.同步修改合并轴管理界面3.IO界面显示16个，16个为一组 --- SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h index 971ee59..02f8081 100644 --- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h +++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h @@ -11,6 +11,7 @@ JOG_ADD, // 姝ｅ悜鐐瑰姩 JOG_SUB, // 鍙嶅悜鐐瑰姩 STOP, // 鍋滄鎿嶄綔 + SEV_ON, // 浣胯兘 POSITION_1, // 瀹氫綅鐐�1 POSITION_2, // 瀹氫綅鐐�2 POSITION_3, // 瀹氫綅鐐�3 @@ -42,18 +43,21 @@ void AdjustControls(float dScaleX, float dScaleY); void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight); void AdjustLabelFont(CBLLabel& label); - void SetStatusColor(CBLLabel& label, BOOL bStatus); + void SetLabelColor(CBLLabel& label, COLORREF color); void updatePageButtonStates(); + void HideEditCursor(int nCtrlID); int getCurrentSelectedAxisID(); void initializeAxisIDCombo(); void refreshAxisDetails(int nAxisId); void refreshPositionDetails(int nAxisId, int pageNumber); + void UpdatePositionRange(PositionRange& position, int pageNumber, int pageSize, int currentIndex); void updateAxisSelection(int offset); void updateDataFromUI(int nAxisId); void switchToPage(int targetPage); + bool ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr); void writeAxisDataToPLC(int nAxisId); void handleAxisOperation(AxisOperationType eOpType, bool bPressed); - + void readPLCDataToUI(int nAxisId); private: CPLC* m_pPLC; @@ -71,18 +75,35 @@ BOOL m_bJogSubPressed; // 鎺т欢 - CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr; + CBlButton* m_pBlBtns[9]; + CBLLabel* m_pBlLabels[6]; 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 鏀寔 virtual BOOL OnInitDialog(); + virtual BOOL PreTranslateMessage(MSG* pMsg); afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnSizing(UINT fwSide, LPRECT pRect); afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor); @@ -100,14 +121,11 @@ afx_msg void OnBnClickedButtonAxisAnchorPoint5(); afx_msg void OnBnClickedButtonAxisTestOpr(); afx_msg void OnBnClickedButtonAxisTestStop(); - afx_msg void OnBnClickedJogAddDown(); - afx_msg void OnBnClickedJogAddUp(); - afx_msg void OnBnClickedJogSubDown(); - afx_msg void OnBnClickedJogSubUp(); + afx_msg void OnBnClickedButtonAxisSev(); 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 OnLButtonDown(UINT nFlags, CPoint point); - //afx_msg void OnLButtonUp(UINT nFlags, CPoint point); + afx_msg void OnClose(); DECLARE_MESSAGE_MAP() }; -- Gitblit v1.9.3