From 39befb77af96d76e12360c368154dbb3ba29fac5 Mon Sep 17 00:00:00 2001 From: gongheng Date: Wed, 1 Apr 2026 11:19:15 +0800 Subject: [PATCH] Feat: add CPU header info storage and cache size formatting - Add DeviceManager CPU header info getters/setters and storage member - Adjust main window initial height to 802 - Rename HeaderInfoTableWidget clear() to resetTableContents() - Add Common::formatTotalCache for converting per-thread cache to total cache and formatting with KiB/MiB/GiB units - Update SPDX year range in DeviceManager files Log: add feature for cpu info show Task: https://pms.uniontech.com/task-view-387697.html --- .../src/DeviceManager/DeviceManager.cpp | 12 +++- .../src/DeviceManager/DeviceManager.h | 7 ++- deepin-devicemanager/src/Page/MainWindow.cpp | 2 +- .../src/Widget/headerinfotablewidget.cpp | 4 +- .../src/Widget/headerinfotablewidget.h | 2 +- deepin-devicemanager/src/commonfunction.cpp | 62 +++++++++++++++++++ deepin-devicemanager/src/commonfunction.h | 2 + 7 files changed, 84 insertions(+), 7 deletions(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp b/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp index 6f802755..e16a9d9b 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -1950,3 +1950,13 @@ void DeviceManager::setCpuFrequencyIsCur(const bool &flag) device->setFrequencyIsCur(flag); } } + +void DeviceManager::setCpuHeaderInfo(const QList > > &info) +{ + m_ListCpuHeaderInfo = info; +} + +void DeviceManager::getCpuHeaderInfo(QList > > &info) const +{ + info = m_ListCpuHeaderInfo; +} diff --git a/deepin-devicemanager/src/DeviceManager/DeviceManager.h b/deepin-devicemanager/src/DeviceManager/DeviceManager.h index 53458b82..6ca8dd92 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceManager.h +++ b/deepin-devicemanager/src/DeviceManager/DeviceManager.h @@ -1,5 +1,4 @@ -// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd. -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -631,6 +630,9 @@ class DeviceManager : public QObject */ void setCpuFrequencyIsCur(const bool &flag); + void setCpuHeaderInfo(const QList>> &info); + void getCpuHeaderInfo(QList>> &info) const; + protected: DeviceManager(); ~DeviceManager(); @@ -669,6 +671,7 @@ class DeviceManager : public QObject static int m_CurrentXlsRow; //>> m_ListCpuHeaderInfo; // 所有物理CPU个体的头部信息 }; #endif // DEVICEMANAGER_H diff --git a/deepin-devicemanager/src/Page/MainWindow.cpp b/deepin-devicemanager/src/Page/MainWindow.cpp index 96cb7447..63e6607c 100644 --- a/deepin-devicemanager/src/Page/MainWindow.cpp +++ b/deepin-devicemanager/src/Page/MainWindow.cpp @@ -49,7 +49,7 @@ DWIDGET_USE_NAMESPACE using namespace DDLog; // 主界面需要的一些宏定义 #define INIT_WIDTH 1000 // 窗口的初始化宽度 -#define INIT_HEIGHT 720 // 窗口的初始化高度 +#define INIT_HEIGHT 802 // 窗口的初始化高度 #define MIN_WIDTH 680 // 窗口的最小宽度 #define MIN_HEIGHT 300 // 窗口的最小高度 diff --git a/deepin-devicemanager/src/Widget/headerinfotablewidget.cpp b/deepin-devicemanager/src/Widget/headerinfotablewidget.cpp index 3e3aaff9..bcdbeb71 100644 --- a/deepin-devicemanager/src/Widget/headerinfotablewidget.cpp +++ b/deepin-devicemanager/src/Widget/headerinfotablewidget.cpp @@ -25,7 +25,7 @@ HeaderInfoTableWidget::HeaderInfoTableWidget(DWidget *parent) void HeaderInfoTableWidget::updateData(const QList> &data) { - clear(); + resetTableContents(); int nRow = data.size(); setRowCount(nRow); @@ -118,7 +118,7 @@ void HeaderInfoTableWidget::paintEvent(QPaintEvent *event) painter.drawLine(vline); } -void HeaderInfoTableWidget::clear() +void HeaderInfoTableWidget::resetTableContents() { DTableWidget::clear(); setRowCount(0); diff --git a/deepin-devicemanager/src/Widget/headerinfotablewidget.h b/deepin-devicemanager/src/Widget/headerinfotablewidget.h index 9b5c67f4..9fadd737 100644 --- a/deepin-devicemanager/src/Widget/headerinfotablewidget.h +++ b/deepin-devicemanager/src/Widget/headerinfotablewidget.h @@ -22,7 +22,7 @@ class HeaderInfoTableWidget : public DTK_WIDGET_NAMESPACE::DTableWidget private: void initUI(); - void clear(); + void resetTableContents(); class HeaderInfoDelegate *m_delegate = nullptr; }; diff --git a/deepin-devicemanager/src/commonfunction.cpp b/deepin-devicemanager/src/commonfunction.cpp index 471befcb..1a7c5200 100644 --- a/deepin-devicemanager/src/commonfunction.cpp +++ b/deepin-devicemanager/src/commonfunction.cpp @@ -239,3 +239,65 @@ QByteArray Common::executeClientCmd(const QString &cmd, const QStringList &args, } return outPut; } + +QString Common::formatTotalCache(const QString &perThreadCache, int coreCount) +{ + // 1. 清理并分离数字与单位 + QString s = perThreadCache.trimmed(); + if (s.isEmpty()) + return QString(); + + int i = s.length() - 1; + while (i >= 0 && !s[i].isDigit() && s[i] != '.') + --i; + + QString numStr = s.left(i + 1); + QString unitStr = s.mid(i + 1).toUpper(); + + bool ok; + double num = numStr.toDouble(&ok); + if (!ok) + return QString(); + + // 2. 将单核/单线程缓存转换为 KiB + double perCoreKiB = 0.0; + if (unitStr.startsWith("K") || unitStr == "KB" || unitStr == "KIB") { + perCoreKiB = num; + } else if (unitStr.startsWith("M") || unitStr == "MB" || unitStr == "MIB") { + perCoreKiB = num * 1024.0; + } else if (unitStr.startsWith("G") || unitStr == "GB" || unitStr == "GIB") { + perCoreKiB = num * 1024.0 * 1024.0; + } else if (unitStr.startsWith("T") || unitStr == "TB" || unitStr == "TIB") { + perCoreKiB = num * 1024.0 * 1024.0 * 1024.0; + } else if (unitStr.isEmpty() || unitStr == "B") { + // 无单位或纯字节，视为字节并转为 KiB + perCoreKiB = num / 1024.0; + } else { + // 未知单位，按原数值当作 KiB 处理 + perCoreKiB = num; + } + + double totalKiB = perCoreKiB * coreCount; + + // 3. 选择最合适的单位并格式化数值 + double value; + QString unit; + if (totalKiB >= 1024.0 * 1024.0) { + value = totalKiB / (1024.0 * 1024.0); + unit = "GiB"; + } else if (totalKiB >= 1024.0) { + value = totalKiB / 1024.0; + unit = "MiB"; + } else { + value = totalKiB; + unit = "KiB"; + } + + // 4. 数值显示：若为整数则无小数位，否则保留一位小数 + double intPart; + if (std::abs(std::modf(value, &intPart)) < 1e-6) { + return QString::number(static_cast(value)) + " " + unit; + } else { + return QString::number(value, 'f', 1) + " " + unit; + } +} diff --git a/deepin-devicemanager/src/commonfunction.h b/deepin-devicemanager/src/commonfunction.h index 414fdac2..83430de0 100644 --- a/deepin-devicemanager/src/commonfunction.h +++ b/deepin-devicemanager/src/commonfunction.h @@ -54,5 +54,7 @@ class Common static SpecialCpuType curCpuType; static QByteArray executeClientCmd(const QString& cmd, const QStringList& args = QStringList(), const QString& workPath = QString(), int msecsWaiting = 30000); + + static QString formatTotalCache(const QString& perThreadCache, int coreCount); }; #endif // COMMONFUNCTION_H