From ec7f596e160d7c6b8831af35fff0f9861f2f234e Mon Sep 17 00:00:00 2001 From: handsome-feng Date: Thu, 10 Dec 2020 16:23:42 +0800 Subject: [PATCH] Drop the qDebug statements --- debian/changelog | 7 +++++++ debian/control | 2 +- src/newresource/cpuhistorychart.cpp | 7 +------ src/newresource/networkchart.cpp | 4 ++-- src/newresource/newresourcesdialog.cpp | 2 +- src/newresource/swapandmemorychart.cpp | 8 ++++---- src/processworker.cpp | 5 +---- src/smoothlinegenerator.cpp | 1 - 8 files changed, 17 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2160c32..b87c0dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ukui-system-monitor (1.0.4-1) unstable; urgency=medium + + * New upstream bugfix release. + * debian/control: bump Standards-Version to 4.5.1. + + -- handsome_feng Wed, 09 Dec 2020 17:12:54 +0800 + ukui-system-monitor (1.0.3-1) unstable; urgency=medium * New upstream release: fix the segmentation fault. diff --git a/debian/control b/debian/control index 54d3b0e..5916e62 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 12), libgsettings-qt-dev, libqt5x11extras5-dev, libpcap-dev -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Rules-Requires-Root: no Homepage: https://www.ukui.org Vcs-Browser: https://github.com/ukui/ukui-system-monitor diff --git a/src/newresource/cpuhistorychart.cpp b/src/newresource/cpuhistorychart.cpp index eabdd89..4b6cf8a 100644 --- a/src/newresource/cpuhistorychart.cpp +++ b/src/newresource/cpuhistorychart.cpp @@ -30,7 +30,6 @@ CpuHistoryChart::CpuHistoryChart(QWidget *parent):QWidget(parent) { this->setMinimumSize(680,90); this->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Expanding); - qDebug()<<"cpu.chart.size"<width(); m_pointsCount = int((this->width()) /10); m_cpuMaxHeight = 50; m_CpuHistoryList = new QList(); @@ -135,7 +134,7 @@ void CpuHistoryChart::refreshCpuHistoryData(double cpu) } for (int i = 0; i < m_CpuHistoryList->size(); i++) { - qDebug()<<"m_CpuHistoryList.size"<size(); +// qDebug()<<"m_CpuHistoryList.size"<size(); if (cpuHistoryMaxHeight < m_cpuMaxHeight) { cpuHistoryPoints.append(QPointF((m_CpuHistoryList->size() - i -2) * POINTSPACE, m_CpuHistoryList->at(i))); @@ -149,10 +148,7 @@ void CpuHistoryChart::refreshCpuHistoryData(double cpu) // update(); // int x = int(m_pointsCount *i * 0.1 + 0.5); -// qDebug()<<"xxx"<refreshCpuHistoryData(value); //about the cpurateForm showing } diff --git a/src/newresource/networkchart.cpp b/src/newresource/networkchart.cpp index 3c9765e..6d7258f 100644 --- a/src/newresource/networkchart.cpp +++ b/src/newresource/networkchart.cpp @@ -102,8 +102,8 @@ void NetWorkChart::paintEvent(QPaintEvent *event) void NetWorkChart::onUpdateDownloadAndUploadData(long recvTotalBytes, long sentTotalBytes, long recvRateBytes, long sentRateBytes) { - qDebug()<<"recvRateBytes"<= 1024 * 1024) // { // emit this->speedToMib(); diff --git a/src/newresource/newresourcesdialog.cpp b/src/newresource/newresourcesdialog.cpp index dea1140..0ef72f8 100644 --- a/src/newresource/newresourcesdialog.cpp +++ b/src/newresource/newresourcesdialog.cpp @@ -347,7 +347,7 @@ void NewResouresDialog::cpuHistoySetText(double value) showValue = QString::number(value,10,0); QString s = "Cpu "+ showValue +":100%"; cpuUnitDataLabel->setText(s); - qDebug()<<"value"< memoryPoints; @@ -105,7 +105,7 @@ void SwapAndMemoryChart::refreshMemoryAndSwapData(float memoryData, double memor } for (int i = 0; i < m_memoryDataList->size(); i++) { - qDebug()<<"m_CpuHistoryList.size"<size(); +// qDebug() << "m_CpuHistoryList.size" << m_memoryDataList->size(); if (memoryMaxHeight < m_memoryMaxHeight) { memoryPoints.append(QPointF((m_memoryDataList->size() - i -2) * POINTSPACE, m_memoryDataList->at(i))); @@ -134,7 +134,7 @@ void SwapAndMemoryChart::refreshMemoryAndSwapData(float memoryData, double memor } for (int i = 0; i < m_swapDataList->size(); i++) { - qDebug()<<"m_CpuHistoryList.size"<size(); +// qDebug() << "m_CpuHistoryList.size" << m_swapDataList->size(); if (swapMaxHeight < m_swapMaxHeight) { swapPoints.append(QPointF((m_swapDataList->size() - i -2) * POINTSPACE, m_swapDataList->at(i))); diff --git a/src/processworker.cpp b/src/processworker.cpp index d5a342b..d0444cb 100644 --- a/src/processworker.cpp +++ b/src/processworker.cpp @@ -218,15 +218,12 @@ static void get_process_name (ProcessWorker *info, const gchar *cmd, const GStrv // and also /usr/bin/interpreter /usr/.../very_long_name // which may have use prctl to alter 'cmd' name for (int i = 0; i != 2 && args[i]; ++i) { -//老方法获取应用名字 char* basename; basename = g_path_get_basename(args[i]); if (g_str_has_prefix(basename, cmd)) { info->name = basename; return; -////新方法获取应用名字 - } g_free(basename); @@ -234,7 +231,7 @@ static void get_process_name (ProcessWorker *info, const gchar *cmd, const GStrv } info->name = g_strdup(cmd); - qDebug()<<"name"<name; +// qDebug()<<"process name: "<name; } static void get_process_systemd_info(ProcessWorker *info) diff --git a/src/smoothlinegenerator.cpp b/src/smoothlinegenerator.cpp index 63f0063..36f112f 100644 --- a/src/smoothlinegenerator.cpp +++ b/src/smoothlinegenerator.cpp @@ -89,7 +89,6 @@ void SmoothLineGenerator::calculateFirstControlPoints(double *&result, const dou void SmoothLineGenerator::calculateControlPoints(const QList &knots, QList *firstControlPoints, QList *secondControlPoints) { int n = knots.size() - 1; - qDebug()<append(QPointF());