From cf39fba9c2a5360d19763a1a25b255fbd513ca15 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 10 Jun 2014 09:27:26 +0400 Subject: [PATCH] fix error in ps dataengine --- CHANGELOG | 3 +++ sources/CMakeLists.txt | 2 +- sources/ext-sysmon/extsysmon.cpp | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e59006d..3713844 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Ver.1.10.1: +- fix error with number formats in ps label + Ver.1.10.0: + added tags $hddtotmb, $hddtotgb + added tags $memtotmb, $memtotgb, $swaptotmb, $swaptotgb diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 9ec6116..f4c5070 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW) project (pytextmonitor) set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MINOR 10) -set (PROJECT_VERSION_PATCH 0) +set (PROJECT_VERSION_PATCH 1) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) message (STATUS "Version: ${PROJECT_VERSION}") diff --git a/sources/ext-sysmon/extsysmon.cpp b/sources/ext-sysmon/extsysmon.cpp index c906afb..ae0ed46 100644 --- a/sources/ext-sysmon/extsysmon.cpp +++ b/sources/ext-sysmon/extsysmon.cpp @@ -662,7 +662,7 @@ void ExtendedSysMon::setPs(int exitCode, QProcess::ExitStatus exitStatus) psList.append(qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]); QString source = QString("ps"); QString key = QString("psCount"); - setData(source, key, QString::number(psList.count())); + setData(source, key, int(QString::number(psList.count()))); key = QString("ps"); setData(source, key, psList.join(QString(","))); } @@ -670,7 +670,7 @@ void ExtendedSysMon::setPs(int exitCode, QProcess::ExitStatus exitStatus) // pstotal QString source = QString("ps"); QString key = QString("psTotal"); - setData(source, key, QString::number(qoutput.split(QChar('\n'), QString::SkipEmptyParts).count())); + setData(source, key, int(QString::number(qoutput.split(QChar('\n'), QString::SkipEmptyParts).count()))); } } }