From 0a0b065a898ea5d87ae82bf39a745e76337fc8f5 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期三, 10 九月 2025 15:19:16 +0800 Subject: [PATCH] 1.一些输出日志信息,更新等级; 2.CPath增加Slot信息; 3.WIP数据显示到列表控件; 4.调整Glass的Path信息文本输出; --- SourceCode/Bond/Servo/CPageGlassList.h | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/SourceCode/Bond/Servo/CPageGlassList.h b/SourceCode/Bond/Servo/CPageGlassList.h index 5fa77a5..5d110a4 100644 --- a/SourceCode/Bond/Servo/CPageGlassList.h +++ b/SourceCode/Bond/Servo/CPageGlassList.h @@ -1,5 +1,6 @@ 锘�#pragma once #include "ListCtrlEx.h" +#include "GlassLogDb.h" // CPageGlassList 瀵硅瘽妗� @@ -18,8 +19,8 @@ IObserver* m_pObserver; // 鎼滅储鍏抽敭瀛� + GlassLogDb::Filters m_filters; std::string m_strStatus; - std::string m_strKeyword; // 椤电爜 int m_nCurPage; @@ -40,14 +41,16 @@ void InitStatusCombo(); void InitTimeRangeCombo(); void InitDateTimeControls(); - void LoadTransfers(); + void LoadData(); void UpdatePageData(); void UpdatePageControls(); - void UpdateDateFilter(); - /* - void FillDataToListCtrl(const std::vector<TransferData>& vecData); - void InsertTransferData(const TransferData& data); - */ + void InsertWipRow(SERVO::CGlass* pGlass); + static bool GlassMatchesFilters(const SERVO::CGlass& g, + const GlassLogDb::Filters& f, + bool useEndTime = false); + void UpdateWipData(); + bool eraseGlassInVector(SERVO::CGlass* pGlass, std::vector<SERVO::CGlass*>& glasses); + void UpdateWipRow(unsigned int index, SERVO::CGlass* pGlass); // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME -- Gitblit v1.9.3