From 74401edd0fb47294538d7253ad15e6a8d3d1fc5a Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期五, 27 六月 2025 09:00:43 +0800 Subject: [PATCH] 1. 防止定时器重复刷新手臂的状态 2. 手臂显示的位置通过配置文件读取 --- SourceCode/Bond/Servo/PageRecipe.h | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h index 69f4cab..55baf65 100644 --- a/SourceCode/Bond/Servo/PageRecipe.h +++ b/SourceCode/Bond/Servo/PageRecipe.h @@ -1,7 +1,6 @@ 锘�#pragma once #include "afxdialogex.h" -//#include "ListCtrlEx.h" - +#include "RecipeManager.h" // CPageRecipe 瀵硅瘽妗� @@ -14,7 +13,8 @@ virtual ~CPageRecipe(); private: - void FillDataToListCtrl(const std::vector<std::string>& vecData); + void FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe); + void FillRecipeListToListCtrl(SERVO::CRecipeList* pList); // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME @@ -24,16 +24,19 @@ protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔 virtual BOOL OnInitDialog(); + afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnBnClickedButtonSearch(); afx_msg void OnBnClickedButtonModify(); afx_msg void OnBnClickedButtonDelete(); afx_msg void OnBnClickedButtonDeleteAll(); - afx_msg void OnBnClickedButtonSave(); afx_msg void OnBnClickedButtonRefresh(); afx_msg void OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult); DECLARE_MESSAGE_MAP() private: CListCtrl m_listPPID; - CEdit m_editPPID; +public: + afx_msg void OnDestroy(); + afx_msg void OnCbnSelchangeComboEquipment(); + afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); }; -- Gitblit v1.9.3